Index: /trunk/psLib/src/Makefile.am =================================================================== --- /trunk/psLib/src/Makefile.am (revision 3937) +++ /trunk/psLib/src/Makefile.am (revision 3938) @@ -11,4 +11,5 @@ lib_LTLIBRARIES = libpslib.la +bin_SCRIPTS = psParseErrorCodes libpslib_la_LIBADD = \ @@ -18,10 +19,10 @@ $(top_builddir)/src/dataIO/libpslibdataIO.la \ $(top_builddir)/src/image/libpslibimage.la \ - $(top_builddir)/src/sysUtils/libpslibsysUtils.la + $(top_builddir)/src/sysUtils/libpslibsysUtils.la -libpslib_la_SOURCES = psTest.c -libpslib_la_LDFLAGS = -version-info $(PSLIB_LT_VERSION) +libpslib_la_SOURCES = psTest.c +libpslib_la_LDFLAGS = -version-info $(PSLIB_LT_VERSION) -EXTRA_DIST = parseErrorCodes.pl mainpage.dox psErrorCodes.dat psTest.h +EXTRA_DIST = mainpage.dox psErrorCodes.dat psTest.h pslibincludedir = $(includedir) @@ -34,3 +35,2 @@ sed "s|\(^dependency_libs=.*\)|dependency_libs=\'$(PSLIB_LIBS)\'|" $(libdir)/libpslib.la > libpslib.la.temp $(INSTALL) libpslib.la.temp $(libdir)/libpslib.la - Index: /trunk/psLib/src/astronomy/Makefile.am =================================================================== --- /trunk/psLib/src/astronomy/Makefile.am (revision 3937) +++ /trunk/psLib/src/astronomy/Makefile.am (revision 3938) @@ -24,5 +24,5 @@ psAstronomyErrors.h: psAstronomyErrors.dat - perl $(top_srcdir)/src/parseErrorCodes.pl --data=$? $@ + $(top_srcdir)/src/psParseErrorCodes --data=$? $@ pslibincludedir = $(includedir) Index: /trunk/psLib/src/collections/Makefile.am =================================================================== --- /trunk/psLib/src/collections/Makefile.am (revision 3937) +++ /trunk/psLib/src/collections/Makefile.am (revision 3938) @@ -28,5 +28,5 @@ psCollectionsErrors.h:psCollectionsErrors.dat - perl $(top_srcdir)/src/parseErrorCodes.pl --data=$? $@ + $(top_srcdir)/src/psParseErrorCodes --data=$? $@ pslibincludedir = $(includedir) @@ -41,4 +41,4 @@ psHash.h \ psMetadata.h \ - psMetadataIO.h + psMetadataIO.h Index: /trunk/psLib/src/dataIO/Makefile.am =================================================================== --- /trunk/psLib/src/dataIO/Makefile.am (revision 3937) +++ /trunk/psLib/src/dataIO/Makefile.am (revision 3938) @@ -21,5 +21,5 @@ psFileUtilsErrors.h: psFileUtilsErrors.dat - perl $(top_srcdir)/src/parseErrorCodes.pl --data=$? $@ + $(top_srcdir)/src/psParseErrorCodes --data=$? $@ pslibincludedir = $(includedir) Index: /trunk/psLib/src/dataManip/Makefile.am =================================================================== --- /trunk/psLib/src/dataManip/Makefile.am (revision 3937) +++ /trunk/psLib/src/dataManip/Makefile.am (revision 3938) @@ -13,10 +13,10 @@ libpslibdataManip_la_SOURCES = psUnaryOp.c psBinaryOp.c psStats.c \ psFunctions.c psMatrix.c psVectorFFT.c psMinimize.c psRandom.c - + BUILT_SOURCES = psDataManipErrors.h EXTRA_DIST = psDataManipErrors.dat psDataManipErrors.h dataManip.i psDataManipErrors.h: psDataManipErrors.dat - perl $(top_srcdir)/src/parseErrorCodes.pl --data=$? $@ + $(top_srcdir)/src/psParseErrorCodes --data=$? $@ pslibincludedir = $(includedir) @@ -31,3 +31,3 @@ psMinimize.h \ psRandom.h - + Index: /trunk/psLib/src/image/Makefile.am =================================================================== --- /trunk/psLib/src/image/Makefile.am (revision 3937) +++ /trunk/psLib/src/image/Makefile.am (revision 3938) @@ -24,5 +24,5 @@ psImageErrors.h: psImageErrors.dat - perl $(top_srcdir)/src/parseErrorCodes.pl --data=$? $@ + $(top_srcdir)/src/psParseErrorCodes --data=$? $@ pslibincludedir = $(includedir) Index: unk/psLib/src/parseErrorCodes.pl =================================================================== --- /trunk/psLib/src/parseErrorCodes.pl (revision 3937) +++ (revision ) @@ -1,97 +1,0 @@ -#!/usr/bin/perl - -# Provides functions for handling long command line options -use Getopt::Long; - -my @ErrorCodes = (); -my @ErrorDescriptions = (); - -my $data = "psErrorCodes.dat"; - -# Assign variables based on the presence of command line options to the script -GetOptions( - "data=s" => \$data, - "verbose" => \$verbose, - "help" => \$help -); - -if ($help) { - print "Usage: parseErrorCodes ", "[--data=$data] ", "[--help] ", - "[--verbose] filename [filename ...]\n\n"; - exit(0); -} - -print "Using data file '$data'\n" if $verbose; -unless ( open( DATAFILE, "<", $data ) ) { - die "Can not open data file $data."; -} - -print "Datafile:\n" if $verbose; -while () { - chop; - if (/^\s*\#/) { - print "C $_\n" if $verbose; - } - else { - if (/^\s*(\w+)\s+([\%\w].*)/) { - my $ErrorCode = $1; - my $ErrorDescription = $2; - print " $ErrorCode: '$ErrorDescription'\n" if $verbose; - push( @ErrorCodes, $ErrorCode ); - push( @ErrorDescriptions, $ErrorDescription ); - } else { - print "I $_\n" if $verbose; - } - } -} -close(DATAFILE); - -my $found = $#ErrorCodes + 1; -print "\nFound $found error codes.\n" if $verbose; - -foreach (@ARGV) { - my $filename = $_; - my @result = (); - - die "Failed to open input file '$filename'" - if !open( INFILE, "<", $filename ); - - print "\nOutput File:\n" if $verbose; - while () { - chop; - push( @result, $_ ); - if (/^\s*\/\/~Start(.*)$/) { - $line = $1; - for ( $n = 0 ; $n < $found ; $n++ ) { - $_ = $line; - s/\$1/$ErrorCodes[$n]/g; - s/\$2/$ErrorDescriptions[$n]/g; - s/\$n/$n/g; - push( @result, $_ ); - print "$_\n" if $verbose; - } - - $break = 0; - while ( ( $break == 0 ) && ( $_ = ) ) { - if (/^\s*\/\/~End/) { - $break = 1; - } - } - chop; - push( @result, $_ ); - } - } - - close(INFILE); - - die "Failed to overwrite input file" - if !open( OUTFILE, ">", $filename ); - - foreach (@result) { - print OUTFILE "$_\n"; - print "$_\n" if $verbose; - } - - close(OUTFILE); - -} Index: /trunk/psLib/src/psParseErrorCodes =================================================================== --- /trunk/psLib/src/psParseErrorCodes (revision 3938) +++ /trunk/psLib/src/psParseErrorCodes (revision 3938) @@ -0,0 +1,97 @@ +#!/usr/bin/perl + +# Provides functions for handling long command line options +use Getopt::Long; + +my @ErrorCodes = (); +my @ErrorDescriptions = (); + +my $data = "psErrorCodes.dat"; + +# Assign variables based on the presence of command line options to the script +GetOptions( + "data=s" => \$data, + "verbose" => \$verbose, + "help" => \$help +); + +if ($help) { + print "Usage: parseErrorCodes ", "[--data=$data] ", "[--help] ", + "[--verbose] filename [filename ...]\n\n"; + exit(0); +} + +print "Using data file '$data'\n" if $verbose; +unless ( open( DATAFILE, "<", $data ) ) { + die "Can not open data file $data."; +} + +print "Datafile:\n" if $verbose; +while () { + chop; + if (/^\s*\#/) { + print "C $_\n" if $verbose; + } + else { + if (/^\s*(\w+)\s+([\%\w].*)/) { + my $ErrorCode = $1; + my $ErrorDescription = $2; + print " $ErrorCode: '$ErrorDescription'\n" if $verbose; + push( @ErrorCodes, $ErrorCode ); + push( @ErrorDescriptions, $ErrorDescription ); + } else { + print "I $_\n" if $verbose; + } + } +} +close(DATAFILE); + +my $found = $#ErrorCodes + 1; +print "\nFound $found error codes.\n" if $verbose; + +foreach (@ARGV) { + my $filename = $_; + my @result = (); + + die "Failed to open input file '$filename'" + if !open( INFILE, "<", $filename ); + + print "\nOutput File:\n" if $verbose; + while () { + chop; + push( @result, $_ ); + if (/^\s*\/\/~Start(.*)$/) { + $line = $1; + for ( $n = 0 ; $n < $found ; $n++ ) { + $_ = $line; + s/\$1/$ErrorCodes[$n]/g; + s/\$2/$ErrorDescriptions[$n]/g; + s/\$n/$n/g; + push( @result, $_ ); + print "$_\n" if $verbose; + } + + $break = 0; + while ( ( $break == 0 ) && ( $_ = ) ) { + if (/^\s*\/\/~End/) { + $break = 1; + } + } + chop; + push( @result, $_ ); + } + } + + close(INFILE); + + die "Failed to overwrite input file" + if !open( OUTFILE, ">", $filename ); + + foreach (@result) { + print OUTFILE "$_\n"; + print "$_\n" if $verbose; + } + + close(OUTFILE); + +} Index: /trunk/psLib/src/sysUtils/Makefile.am =================================================================== --- /trunk/psLib/src/sysUtils/Makefile.am (revision 3937) +++ /trunk/psLib/src/sysUtils/Makefile.am (revision 3938) @@ -19,5 +19,5 @@ psString.c \ psConfigure.c \ - psErrorCodes.c + psErrorCodes.c BUILT_SOURCES = psSysUtilsErrors.h @@ -25,5 +25,5 @@ psSysUtilsErrors.h: psSysUtilsErrors.dat - perl $(top_srcdir)/src/parseErrorCodes.pl --data=$? $@ + $(top_srcdir)/src/psParseErrorCodes --data=$? $@ pslibincludedir = $(includedir)