IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 3127 for trunk/psLib/src


Ignore:
Timestamp:
Feb 4, 2005, 12:49:39 PM (21 years ago)
Author:
desonia
Message:

general autoconf cleanup.

Location:
trunk/psLib
Files:
1 deleted
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib

    • Property svn:ignore

      •  

        old new  
         1DoxygenLog
        12bin
        23lib

  • trunk/psLib/src/Makefile.am

    r3123 r3127  
    2323libpslib_la_LDFLAGS = -version-info $(PSLIB_LT_VERSION)
    2424
    25 EXTRA_DIST = parseErrorCodes.pl mainpage.dox Doxyfile psErrorCodes.dat psTest.h
     25EXTRA_DIST = parseErrorCodes.pl mainpage.dox psErrorCodes.dat psTest.h
    2626
    2727pslibincludedir = $(includedir)

  • trunk/psLib/src/astronomy/Makefile.am

    r3122 r3127  
    2222BUILT_SOURCES = psAstronomyErrors.h
    2323
    24 EXTRA_DIST = psAstronomyErrors.dat psAstronomyErrors.h
     24EXTRA_DIST = psAstronomyErrors.dat psAstronomyErrors.h astronomy.i
    2525
    2626psAstronomyErrors.h: psAstronomyErrors.dat

  • trunk/psLib/src/collections/Makefile.am

    r3122 r3127  
    2121
    2222BUILT_SOURCES = psCollectionsErrors.h
    23 EXTRA_DIST = psCollectionsErrors.dat psCollectionsErrors.h
     23EXTRA_DIST = psCollectionsErrors.dat psCollectionsErrors.h collections.i
    2424
    2525psCollectionsErrors.h:psCollectionsErrors.dat

  • trunk/psLib/src/dataIO/Makefile.am

    r3122 r3127  
    1616
    1717BUILT_SOURCES = psFileUtilsErrors.h
    18 EXTRA_DIST = psFileUtilsErrors.dat psFileUtilsErrors.h
     18EXTRA_DIST = psFileUtilsErrors.dat psFileUtilsErrors.h fileUtils.i
    1919
    2020psFileUtilsErrors.h: psFileUtilsErrors.dat

  • trunk/psLib/src/dataManip/Makefile.am

    r3122 r3127  
    2121           
    2222BUILT_SOURCES = psDataManipErrors.h
    23 EXTRA_DIST = psDataManipErrors.dat psDataManipErrors.h
     23EXTRA_DIST = psDataManipErrors.dat psDataManipErrors.h dataManip.i
    2424
    2525psDataManipErrors.h: psDataManipErrors.dat

  • trunk/psLib/src/fileUtils/Makefile.am

    r3122 r3127  
    1616
    1717BUILT_SOURCES = psFileUtilsErrors.h
    18 EXTRA_DIST = psFileUtilsErrors.dat psFileUtilsErrors.h
     18EXTRA_DIST = psFileUtilsErrors.dat psFileUtilsErrors.h fileUtils.i
    1919
    2020psFileUtilsErrors.h: psFileUtilsErrors.dat

  • trunk/psLib/src/image/Makefile.am

    r3122 r3127  
    2121
    2222BUILT_SOURCES = psImageErrors.h
    23 EXTRA_DIST = psImageErrors.dat psImageErrors.h
     23EXTRA_DIST = psImageErrors.dat psImageErrors.h image.i
    2424
    2525psImageErrors.h: psImageErrors.dat

  • trunk/psLib/src/psTest.c

    r3115 r3127  
    3838    psS32 n;
    3939    extern char *optarg;
     40
     41    char* fileName = (char*)testPointFile;
     42    char* lastSlashInFile = strrchr(testPointFile,'/');
     43    if (lastSlashInFile != NULL) {
     44        fileName = lastSlashInFile+1;
     45    }
    4046
    4147    if ( argc > 0 ) {
    … …  
    5864                break;
    5965            case 'l':
    60                 printf( "Test Driver:  %s\n", testPointFile );
     66                printf( "Test Driver:  %s\n", fileName );
    6167                printf( "Package Name: %s\n", packageName );
    6268                printf( "Testpoints:\n" );
    … …  
    7379                    if ( strcmp( optarg, tests[ index ].testPointName ) == 0 ) {
    7480                        success = p_runTest( fp,
    75                                              testPointFile,
     81                                             fileName,
    7682                                             packageName,
    7783                                             tests[ index ].testPointName,
    … …  
    94100                        found = true;
    95101                        success = p_runTest( fp,
    96                                              testPointFile,
     102                                             fileName,
    97103                                             packageName,
    98104                                             tests[ index ].testPointName,
    … …  
    119125            if ( ! tests[ index ].isDuplicateEntry ) {
    120126                success = p_runTest( fp,
    121                                      testPointFile,
     127                                     fileName,
    122128                                     packageName,
    123129                                     tests[ index ].testPointName,
    … …  
    143149    pid_t child;
    144150
    145     p_printPositiveTestHeader( fp, testPointFile, packageName, testPointName );
     151    char* fileName = (char*)testPointFile;
     152    char* lastSlashInFile = strrchr(testPointFile,'/');
     153    if (lastSlashInFile != NULL) {
     154        fileName = lastSlashInFile+1;
     155    }
     156
     157    p_printPositiveTestHeader( fp, fileName, packageName, testPointName );
    146158
    147159    if ( useFork ) {
    … …  
    193205    }
    194206
    195     p_printFooter( fp, testPointFile, packageName, testPointName,
     207    p_printFooter( fp, fileName, packageName, testPointName,
    196208                   ( childReturn == expectedReturn ) );
    197209
    … …  
    206218    char TP[ 80 ];
    207219
     220    char* fileName = (char*)testPointFile;
     221    char* lastSlashInFile = strrchr(testPointFile,'/');
     222    if (lastSlashInFile != NULL) {
     223        fileName = lastSlashInFile+1;
     224    }
     225
    208226    snprintf( TP, 80, "%s{%s}", packageName, testPointName );
    209227
    210228    fprintf( fp, HEADER_TOP );
    211     fprintf( fp, HEADER_LINE_STRING, "TestFile", testPointFile );
     229    fprintf( fp, HEADER_LINE_STRING, "TestFile", fileName);
    212230    fprintf( fp, HEADER_LINE_STRING, "TestPoint", TP );
    213231    fprintf( fp, HEADER_LINE_STRING, "TestType", "Positive" );
    … …  
    224242    char TP[ 80 ];
    225243
     244    char* fileName = (char*)testPointFile;
     245    char* lastSlashInFile = strrchr(testPointFile,'/');
     246    if (lastSlashInFile != NULL) {
     247        fileName = lastSlashInFile+1;
     248    }
     249
    226250    snprintf( TP, 80, "%s{%s}", packageName, testPointName );
    227251
    228252    fprintf( fp, HEADER_TOP );
    229     fprintf( fp, HEADER_LINE_STRING, "TestFile", testPointFile );
     253    fprintf( fp, HEADER_LINE_STRING, "TestFile", fileName);
    230254    fprintf( fp, HEADER_LINE_STRING, "TestPoint", TP );
    231255    fprintf( fp, HEADER_LINE_STRING, "TestType", "Negative" );
    … …  
    242266                    psBool success )
    243267{
     268    char* fileName = (char*)testPointFile;
     269    char* lastSlashInFile = strrchr(testPointFile,'/');
     270    if (lastSlashInFile != NULL) {
     271        fileName = lastSlashInFile+1;
     272    }
     273
    244274    if ( success ) {
    245         fprintf( fp, "\n---> TESTPOINT PASSED (%s{%s} | %s)\n\n", packageName, testPointName, testPointFile );
     275        fprintf( fp, "\n---> TESTPOINT PASSED (%s{%s} | %s)\n\n", packageName, testPointName, fileName);
    246276    } else {
    247         fprintf( fp, "\n---> TESTPOINT FAILED (%s{%s} | %s)\n\n", packageName, testPointName, testPointFile );
    248     }
    249 }
     277        fprintf( fp, "\n---> TESTPOINT FAILED (%s{%s} | %s)\n\n", packageName, testPointName, fileName);
     278    }
     279}

  • trunk/psLib/src/sysUtils/Makefile.am

    r3122 r3127  
    2222
    2323BUILT_SOURCES = psSysUtilsErrors.h
    24 EXTRA_DIST = psSysUtilsErrors.dat psSysUtilsErrors.h
     24EXTRA_DIST = psSysUtilsErrors.dat psSysUtilsErrors.h sysUtils.i
    2525
    2626psSysUtilsErrors.h: psSysUtilsErrors.dat
Note: See TracChangeset for help on using the changeset viewer.