mirror of
				https://github.com/bspeice/libcvautomation
				synced 2025-11-04 02:10:35 -05:00 
			
		
		
		
	Implement a cleaner way of tracking version number
This commit is contained in:
		@ -2,10 +2,10 @@
 | 
			
		||||
# Process this file with autoconf to produce a configure script.
 | 
			
		||||
 | 
			
		||||
AC_PREREQ(2.59)
 | 
			
		||||
AC_INIT(libcvautomation, 0.1, bspeice@uncc.edu)
 | 
			
		||||
AC_INIT(libcvautomation, 1.0, bspeice@uncc.edu)
 | 
			
		||||
#AC_CONFIG_HEADERS([config.h])
 | 
			
		||||
AM_INIT_AUTOMAKE
 | 
			
		||||
 | 
			
		||||
#AC_CONFIG_HEADERS([config.h])
 | 
			
		||||
 | 
			
		||||
#path intelc110		/opt/coe/intelc110
 | 
			
		||||
# Checks for programs.
 | 
			
		||||
 | 
			
		||||
@ -6,7 +6,6 @@
 | 
			
		||||
 *    Description:  This is an example program to demonstrate the XTest and XInput
 | 
			
		||||
 *    				functionality in libcvautomation
 | 
			
		||||
 *
 | 
			
		||||
 *        Version:  1.0
 | 
			
		||||
 *        Created:  06/26/2012 09:20:20 AM
 | 
			
		||||
 *       Revision:  none
 | 
			
		||||
 *       Compiler:  gcc
 | 
			
		||||
@ -50,6 +49,7 @@ int main( int argc, char** argv )
 | 
			
		||||
		{
 | 
			
		||||
				{"help",		no_argument,		0,	'h'},
 | 
			
		||||
				{"usage",		no_argument,		0,	'u'},
 | 
			
		||||
				{"version",		no_argument,		0,	'v'},
 | 
			
		||||
				{"display",		required_argument,	0,	'd'},
 | 
			
		||||
				{"search-method",required_argument,	0,	'm'},
 | 
			
		||||
				{"tolerance",	required_argument,	0,	't'},
 | 
			
		||||
@ -85,6 +85,10 @@ int main( int argc, char** argv )
 | 
			
		||||
				usage();
 | 
			
		||||
				break;
 | 
			
		||||
 | 
			
		||||
			case 'v':
 | 
			
		||||
				usage();
 | 
			
		||||
				break;
 | 
			
		||||
 | 
			
		||||
			case 'd':
 | 
			
		||||
				if (display == NULL)
 | 
			
		||||
					display = XOpenDisplay( optarg );
 | 
			
		||||
@ -142,10 +146,9 @@ int main( int argc, char** argv )
 | 
			
		||||
 */
 | 
			
		||||
void usage ( )
 | 
			
		||||
{
 | 
			
		||||
	fprintf( stderr, "\n\
 | 
			
		||||
cva-input -i <image_file>\n\
 | 
			
		||||
cva-input -x <x_location> -y <y_location>\n\
 | 
			
		||||
cva-input -k <key>\n\
 | 
			
		||||
	fprintf( stderr, "\
 | 
			
		||||
Libcvautomation version: %s\n\
 | 
			
		||||
cva-input -s <command_string>\n\
 | 
			
		||||
\n\
 | 
			
		||||
The cva-input program demonstrates the XTest section of libcvautomation.\n\
 | 
			
		||||
\n\
 | 
			
		||||
@ -182,7 +185,7 @@ Available commands:\n\
 | 
			
		||||
\tkeyup:\tRelease a keyboard button.\n\
 | 
			
		||||
\tkeystring:\tInput a string of keys to X11.\n\
 | 
			
		||||
\n\
 | 
			
		||||
If you have any questions, comments, concerns, email <bspeice@uncc.edu>.\n\n" );
 | 
			
		||||
If you have any questions, comments, concerns, email <%s>.\n\n", LIBCVAUTOMATION_VERSION, LIBCVAUTOMATION_BUGREPORT );
 | 
			
		||||
 | 
			
		||||
	exit (0);
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -63,6 +63,7 @@ int main( int argc, char** argv )
 | 
			
		||||
		{
 | 
			
		||||
				{"help",		no_argument,		0,	'h'},
 | 
			
		||||
				{"usage",		no_argument,		0,	'u'},
 | 
			
		||||
				{"version",		no_argument,		0,	'v'},
 | 
			
		||||
				{"root-image",	required_argument,	0,	'r'},
 | 
			
		||||
				{"sub-image",	required_argument,	0,	's'},
 | 
			
		||||
				{"separator",	required_argument,	0,	'p'},
 | 
			
		||||
@ -97,6 +98,10 @@ int main( int argc, char** argv )
 | 
			
		||||
				usage();
 | 
			
		||||
				break;
 | 
			
		||||
 | 
			
		||||
			case 'v':
 | 
			
		||||
				usage();
 | 
			
		||||
				break;
 | 
			
		||||
 | 
			
		||||
			case 'r':
 | 
			
		||||
				root_location = optarg;
 | 
			
		||||
				break;
 | 
			
		||||
@ -208,7 +213,8 @@ int main( int argc, char** argv )
 | 
			
		||||
 */
 | 
			
		||||
void usage ( )
 | 
			
		||||
{
 | 
			
		||||
	fprintf( stderr, "\n\
 | 
			
		||||
	fprintf( stderr, "\
 | 
			
		||||
Libcvautomation version: %s\n\
 | 
			
		||||
cva-match -r <root_image> -s <sub_image> \n\
 | 
			
		||||
cva-match -s <sub_image> -x \n\
 | 
			
		||||
\n\
 | 
			
		||||
@ -244,7 +250,7 @@ Usage: \n\
 | 
			
		||||
\t-o, --sane-tolerance:\tSet the tolerance using a scale of 1-100,\n\
 | 
			
		||||
\t\t\t\trather than INT_MIN to INT_MAX (100 ~= INT_MAX)\n\
 | 
			
		||||
\n\
 | 
			
		||||
If you have any questions, comments, concerns, email bspeice@uncc.edu\n" );
 | 
			
		||||
If you have any questions, comments, concerns, email <%s>\n", LIBCVAUTOMATION_VERSION, LIBCVAUTOMATION_BUGREPORT );
 | 
			
		||||
 | 
			
		||||
	exit (0);
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -5,7 +5,6 @@
 | 
			
		||||
 *
 | 
			
		||||
 *    Description:  Function definitions for opencv functionality
 | 
			
		||||
 *
 | 
			
		||||
 *        Version:  1.0
 | 
			
		||||
 *        Created:  06/21/2012 08:34:21 AM
 | 
			
		||||
 *       Revision:  none
 | 
			
		||||
 *       Compiler:  gcc
 | 
			
		||||
 | 
			
		||||
@ -5,7 +5,6 @@
 | 
			
		||||
 *
 | 
			
		||||
 *    Description:  Function definitions for X11 operations
 | 
			
		||||
 *
 | 
			
		||||
 *        Version:  1.0
 | 
			
		||||
 *        Created:  06/21/2012 08:34:21 AM
 | 
			
		||||
 *       Revision:  none
 | 
			
		||||
 *       Compiler:  gcc
 | 
			
		||||
 | 
			
		||||
@ -5,7 +5,6 @@
 | 
			
		||||
 *
 | 
			
		||||
 *    Description:  
 | 
			
		||||
 *
 | 
			
		||||
 *        Version:  1.0
 | 
			
		||||
 *        Created:  06/26/2012 09:08:41 AM
 | 
			
		||||
 *       Revision:  none
 | 
			
		||||
 *       Compiler:  gcc
 | 
			
		||||
 | 
			
		||||
@ -5,7 +5,6 @@
 | 
			
		||||
 *
 | 
			
		||||
 *    Description:  Include wrapper for libcvautomation subsections
 | 
			
		||||
 *
 | 
			
		||||
 *        Version:  1.0
 | 
			
		||||
 *        Created:  06/21/2012 12:20:43 PM
 | 
			
		||||
 *       Revision:  none
 | 
			
		||||
 *       Compiler:  gcc
 | 
			
		||||
@ -18,6 +17,9 @@
 | 
			
		||||
#ifndef LIBCVAUTOMATION_H
 | 
			
		||||
#define LIBCVAUTOMATION_H
 | 
			
		||||
 | 
			
		||||
#define LIBCVAUTOMATION_VERSION "1.0"
 | 
			
		||||
#define LIBCVAUTOMATION_BUGREPORT "bspeice@uncc.edu"
 | 
			
		||||
 | 
			
		||||
/* C includes */
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
#include <string.h>
 | 
			
		||||
 | 
			
		||||
@ -18,6 +18,9 @@
 | 
			
		||||
#ifndef LIBCVAUTOMATION_H
 | 
			
		||||
#define LIBCVAUTOMATION_H
 | 
			
		||||
 | 
			
		||||
#define LIBCVAUTOMATION_VERSION "1.0"
 | 
			
		||||
#define LIBCVAUTOMATION_BUGREPORT "bspeice@uncc.edu"
 | 
			
		||||
 | 
			
		||||
/* C includes */
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
#include <string.h>
 | 
			
		||||
 | 
			
		||||
@ -5,7 +5,6 @@
 | 
			
		||||
 *
 | 
			
		||||
 *    Description:  
 | 
			
		||||
 *
 | 
			
		||||
 *        Version:  1.0
 | 
			
		||||
 *        Created:  06/21/2012 08:34:21 AM
 | 
			
		||||
 *       Revision:  none
 | 
			
		||||
 *       Compiler:  gcc
 | 
			
		||||
 | 
			
		||||
@ -5,7 +5,6 @@
 | 
			
		||||
 *
 | 
			
		||||
 *    Description:  
 | 
			
		||||
 *
 | 
			
		||||
 *        Version:  1.0
 | 
			
		||||
 *        Created:  06/21/2012 08:34:21 AM
 | 
			
		||||
 *       Revision:  none
 | 
			
		||||
 *       Compiler:  gcc
 | 
			
		||||
 | 
			
		||||
@ -5,7 +5,6 @@
 | 
			
		||||
 *
 | 
			
		||||
 *    Description:  
 | 
			
		||||
 *
 | 
			
		||||
 *        Version:  1.0
 | 
			
		||||
 *        Created:  06/26/2012 09:09:05 AM
 | 
			
		||||
 *       Revision:  none
 | 
			
		||||
 *       Compiler:  gcc
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user