Changeset 536


Ignore:
Timestamp:
04/03/2006 01:33:46 (6 years ago)
Author:
martin
Message:

This is part 1 of a patch from James O'Gorman.

configure now detects perl executable location and updates all scripts to use the correct path; also adds PERL_EXECUTABLE define to BoxConfig?.h. makebuildenv.pl adds PERL define to all makefiles.

Location:
box/trunk
Files:
29 edited

Legend:

Unmodified
Added
Removed

  • box/trunk/bin/bbackupd/bbackupd-config

    r353 r536  
    1 #!/usr/bin/perl 
     1#!@PERL@ 
    22use strict; 
    33 

  • box/trunk/bin/bbackupquery/Makefile.extra

    r217 r536  
    22# AUTOGEN SEEDING 
    33autogen_Documentation.cpp:      makedocumentation.pl documentation.txt 
    4         perl makedocumentation.pl 
     4        $(PERL) makedocumentation.pl 
    55 
    66 

  • box/trunk/bin/bbackupquery/makedocumentation.pl

    r217 r536  
    1 #!/usr/bin/perl 
     1#!@PERL@ 
    22use strict; 
    33 

  • box/trunk/bin/bbstored/Makefile.extra

    r217 r536  
    66# AUTOGEN SEEDING 
    77autogen_BackupProtocolServer.cpp autogen_BackupProtocolServer.h:        $(MAKEPROTOCOL) backupprotocol.txt 
    8         perl $(GEN_CMD_SRV) 
     8        $(PERL) $(GEN_CMD_SRV) 
    99 

  • box/trunk/bin/bbstored/bbstored-certs

    r217 r536  
    1 #!/usr/bin/perl 
     1#!@PERL@ 
    22use strict; 
    33 

  • box/trunk/bin/bbstored/bbstored-config

    r217 r536  
    1 #!/usr/bin/perl 
     1#!@PERL@ 
    22use strict; 
    33 

  • box/trunk/configure.ac

    r487 r536  
    33 
    44AC_PREREQ(2.59) 
    5 AC_INIT([Box Backup], 0.09, [box@fluffy.co.uk]) 
     5AC_INIT([Box Backup], 0.10, [box@fluffy.co.uk]) 
    66AC_CONFIG_SRCDIR([lib/common/Box.h]) 
    77AC_CONFIG_HEADERS([lib/common/BoxConfig.h]) 
    … …  
    2626  # Use -rdynamic if we have gcc. This is needed for backtrace 
    2727  AC_SUBST([LDADD_RDYNAMIC], ['-rdynamic']) 
     28fi 
     29AC_PATH_PROG([PERL], [perl], [no]) 
     30if test "x$PERL" != "xno"; then 
     31  AC_DEFINE_UNQUOTED([PERL_EXECUTABLE], ["$PERL"], [Location of the perl executable]) 
     32else 
     33  AC_MSG_ERROR([[perl executable was not found]]) 
    2834fi 
    2935 
    … …  
    204210 
    205211### Output files 
    206 AC_CONFIG_FILES([infrastructure/BoxPlatform.pm]) 
     212AC_CONFIG_FILES([bin/bbackupd/bbackupd-config 
     213                 bin/bbackupquery/makedocumentation.pl 
     214                 bin/bbstored/bbstored-certs 
     215                 bin/bbstored/bbstored-config 
     216                 infrastructure/BoxPlatform.pm 
     217                 infrastructure/makebuildenv.pl 
     218                 infrastructure/makeparcels.pl 
     219                 lib/common/makeexception.pl 
     220                 lib/raidfile/raidfile-config 
     221                 lib/server/makeprotocol.pl 
     222                 runtest.pl 
     223                 test/backupstorefix/testfiles/testbackupstorefix.pl 
     224                 test/bbackupd/testfiles/extcheck1.pl 
     225                 test/bbackupd/testfiles/extcheck2.pl 
     226                 test/bbackupd/testfiles/notifyscript.pl]) 
    207227AC_OUTPUT 
    208228 
    209229# Configure the Box build system 
    210230echo 
    211 perl ./infrastructure/makebuildenv.pl && 
    212   perl ./infrastructure/makeparcels.pl 
     231$PERL ./infrastructure/makebuildenv.pl && 
     232  $PERL ./infrastructure/makeparcels.pl 
    213233 
    214234# Write summary of important info 

  • box/trunk/distribution/boxbackup/contrib/cygwin/install-cygwin-service.pl

    r217 r536  
    1 #!/usr/bin/perl -w 
     1#!@PERL@ -w 
    22 
    33 

  • box/trunk/infrastructure/makebuildenv.pl

    r362 r536  
    1 #!/usr/bin/perl 
     1#!@PERL@ 
    22use strict; 
    33use Symbol; 
    … …  
    498498AR = ar 
    499499RANLIB = ranlib 
     500PERL = \@PERL\@ 
    500501.ifdef RELEASE 
    501502CXXFLAGS = -DNDEBUG $release_flags -Wall $include_paths $extra_platform_defines -DBOX_VERSION="\\"$product_version\\"" 

  • box/trunk/infrastructure/makedistribution.pl

    r458 r536  
    1 #!/usr/bin/perl 
     1#!@PERL@ 
    22use strict; 
    33use Symbol; 

  • box/trunk/infrastructure/makeparcels.pl

    r456 r536  
    1 #!/usr/bin/perl 
     1#!@PERL@ 
    22 
    33use strict; 

  • box/trunk/infrastructure/setupexternal.pl

    r217 r536  
    1 #!/usr/bin/perl 
     1#!@PERL@ 
    22use strict; 
    33 

  • box/trunk/lib/backupclient/Makefile.extra

    r217 r536  
    66# AUTOGEN SEEDING 
    77autogen_BackupProtocolClient.cpp autogen_BackupProtocolClient.h:        $(MAKEPROTOCOL) ../../bin/bbstored/backupprotocol.txt 
    8         perl $(GEN_CMD_SRV) 
     8        $(PERL) $(GEN_CMD_SRV) 
    99 
    1010 
    … …  
    1313# AUTOGEN SEEDING 
    1414autogen_BackupStoreException.h autogen_BackupStoreException.cpp:        $(MAKEEXCEPTION) BackupStoreException.txt 
    15         perl $(MAKEEXCEPTION) BackupStoreException.txt 
     15        $(PERL) $(MAKEEXCEPTION) BackupStoreException.txt 
    1616 

  • box/trunk/lib/common/Makefile.extra

    r217 r536  
    44# AUTOGEN SEEDING 
    55autogen_CommonException.h autogen_CommonException.cpp:  $(MAKEEXCEPTION) CommonException.txt 
    6         perl $(MAKEEXCEPTION) CommonException.txt 
     6        $(PERL) $(MAKEEXCEPTION) CommonException.txt 
    77 
    88# AUTOGEN SEEDING 
    99autogen_ConversionException.h autogen_ConversionException.cpp:  $(MAKEEXCEPTION) ConversionException.txt 
    10         perl $(MAKEEXCEPTION) ConversionException.txt 
     10        $(PERL) $(MAKEEXCEPTION) ConversionException.txt 
    1111 

  • box/trunk/lib/common/makeexception.pl

    r217 r536  
    1 #!/usr/bin/perl 
     1#!@PERL@ 
    22 
    33# global exception list file 

  • box/trunk/lib/compress/Makefile.extra

    r217 r536  
    44# AUTOGEN SEEDING 
    55autogen_CompressException.h autogen_CompressException.cpp:      $(MAKEEXCEPTION) CompressException.txt 
    6         perl $(MAKEEXCEPTION) CompressException.txt 
     6        $(PERL) $(MAKEEXCEPTION) CompressException.txt 
    77 

  • box/trunk/lib/crypto/Makefile.extra

    r217 r536  
    44# AUTOGEN SEEDING 
    55autogen_CipherException.cpp autogen_CipherException.h:  $(MAKEEXCEPTION) CipherException.txt 
    6         perl $(MAKEEXCEPTION) CipherException.txt 
     6        $(PERL) $(MAKEEXCEPTION) CipherException.txt 
    77 

  • box/trunk/lib/raidfile/Makefile.extra

    r217 r536  
    44# AUTOGEN SEEDING 
    55autogen_RaidFileException.h autogen_RaidFileException.cpp:      $(MAKEEXCEPTION) RaidFileException.txt 
    6         perl $(MAKEEXCEPTION) RaidFileException.txt 
     6        $(PERL) $(MAKEEXCEPTION) RaidFileException.txt 
    77 

  • box/trunk/lib/raidfile/raidfile-config

    r217 r536  
    1 #!/usr/bin/perl 
     1#!@PERL@ 
    22use strict; 
    33 

  • box/trunk/lib/server/Makefile.extra

    r217 r536  
    44# AUTOGEN SEEDING 
    55autogen_ServerException.h autogen_ServerException.cpp:  $(MAKEEXCEPTION) ServerException.txt 
    6         perl $(MAKEEXCEPTION) ServerException.txt 
     6        $(PERL) $(MAKEEXCEPTION) ServerException.txt 
    77 
    88# AUTOGEN SEEDING 
    99autogen_ConnectionException.h autogen_ConnectionException.cpp:  $(MAKEEXCEPTION) ConnectionException.txt 
    10         perl $(MAKEEXCEPTION) ConnectionException.txt 
     10        $(PERL) $(MAKEEXCEPTION) ConnectionException.txt 
    1111 

  • box/trunk/lib/server/makeprotocol.pl

    r217 r536  
    1 #!/usr/bin/perl 
     1#!@PERL@ 
    22use strict; 
    33 

  • box/trunk/runtest.pl

    r219 r536  
    1 #!/usr/bin/perl 
     1#!@PERL@ 
    22 
    33use lib 'infrastructure'; 

  • box/trunk/test/backupstorefix/testbackupstorefix.cpp

    r217 r536  
    313313 
    314314                // Run the perl script to create the initial directories 
    315                 TEST_THAT_ABORTONFAIL(::system("perl testfiles/testbackupstorefix.pl init") == 0); 
     315                TEST_THAT_ABORTONFAIL(::system(PERL_EXECUTABLE " testfiles/testbackupstorefix.pl init") == 0); 
    316316 
    317317                int bbackupd_pid = LaunchServer("../../bin/bbackupd/bbackupd testfiles/bbackupd.conf", "testfiles/bbackupd.pid"); 
    … …  
    368368                RUN_CHECK 
    369369                // Check everything is as it was 
    370                 TEST_THAT(::system("perl testfiles/testbackupstorefix.pl check 0") == 0); 
     370                TEST_THAT(::system(PERL_EXECUTABLE " testfiles/testbackupstorefix.pl check 0") == 0); 
    371371                // Check the random file doesn't exist 
    372372                { 
    … …  
    426426                        RUN_CHECK 
    427427                        // Check 
    428                         TEST_THAT(::system("perl testfiles/testbackupstorefix.pl check 1") == 0); 
     428                        TEST_THAT(::system(PERL_EXECUTABLE " testfiles/testbackupstorefix.pl check 1") == 0); 
    429429 
    430430                        // Check the modified file doesn't exist 
    … …  
    472472                RUN_CHECK 
    473473                // Check everything is as it should be 
    474                 TEST_THAT(::system("perl testfiles/testbackupstorefix.pl check 2") == 0); 
     474                TEST_THAT(::system(PERL_EXECUTABLE " testfiles/testbackupstorefix.pl check 2") == 0); 
    475475                { 
    476476                        BackupStoreDirectory dir; 
    … …  
    528528                RUN_CHECK 
    529529                // Check everything is as it should be 
    530                 TEST_THAT(::system("perl testfiles/testbackupstorefix.pl check 3") == 0); 
     530                TEST_THAT(::system(PERL_EXECUTABLE " testfiles/testbackupstorefix.pl check 3") == 0); 
    531531                { 
    532532                        BackupStoreDirectory dir; 
    … …  
    542542                RUN_CHECK 
    543543                // Check everything is where it is predicted to be 
    544                 TEST_THAT(::system("perl testfiles/testbackupstorefix.pl check 4") == 0); 
     544                TEST_THAT(::system(PERL_EXECUTABLE " testfiles/testbackupstorefix.pl check 4") == 0); 
    545545 
    546546                // ------------------------------------------------------------------------------------------------              
    … …  
    553553                RUN_CHECK 
    554554                // Check everything is where it should be 
    555                 TEST_THAT(::system("perl testfiles/testbackupstorefix.pl check 5") == 0); 
     555                TEST_THAT(::system(PERL_EXECUTABLE " testfiles/testbackupstorefix.pl check 5") == 0); 
    556556 
    557557                // ------------------------------------------------------------------------------------------------              
    … …  
    567567                RUN_CHECK 
    568568                // Check everything is where it should be 
    569                 TEST_THAT(::system("perl testfiles/testbackupstorefix.pl reroot 6") == 0); 
     569                TEST_THAT(::system(PERL_EXECUTABLE " testfiles/testbackupstorefix.pl reroot 6") == 0); 
    570570 
    571571 

  • box/trunk/test/backupstorefix/testfiles/testbackupstorefix.pl

    r217 r536  
    1 #!/usr/bin/perl 
     1#!@PERL@ 
    22use strict; 
    33 

  • box/trunk/test/basicserver/Makefile.extra

    r217 r536  
    77# AUTOGEN SEEDING 
    88autogen_TestProtocolServer.cpp: $(MAKEPROTOCOL) testprotocol.txt 
    9         perl $(GEN_CMD_SRV) 
     9        $(PERL) $(GEN_CMD_SRV) 
    1010 
    1111autogen_TestProtocolServer.h:   $(MAKEPROTOCOL) testprotocol.txt 
    12         perl $(GEN_CMD_SRV) 
     12        $(PERL) $(GEN_CMD_SRV) 
    1313 
    1414 
    1515# AUTOGEN SEEDING 
    1616autogen_TestProtocolClient.cpp: $(MAKEPROTOCOL) testprotocol.txt 
    17         perl $(GEN_CMD_CLI) 
     17        $(PERL) $(GEN_CMD_CLI) 
    1818 
    1919autogen_TestProtocolClient.h:   $(MAKEPROTOCOL) testprotocol.txt 
    20         perl $(GEN_CMD_CLI) 
     20        $(PERL) $(GEN_CMD_CLI) 
    2121 

  • box/trunk/test/bbackupd/testfiles/bbackupd.conf

    r217 r536  
    2424CommandSocket = testfiles/bbackupd.sock 
    2525 
    26 NotifyScript = perl testfiles/notifyscript.pl 
     26NotifyScript = @PERL@ testfiles/notifyscript.pl 
    2727 
    2828Server 

  • box/trunk/test/bbackupd/testfiles/extcheck1.pl

    r217 r536  
    1 #!/usr/bin/perl 
     1#!@PERL@ 
    22use strict; 
    33 

  • box/trunk/test/bbackupd/testfiles/extcheck2.pl

    r217 r536  
    1 #!/usr/bin/perl 
     1#!@PERL@ 
    22use strict; 
    33 

  • box/trunk/test/bbackupd/testfiles/notifyscript.pl

    r217 r536  
    1 #!/usr/bin/perl 
     1#!@PERL@ 
    22 
    33 
Note: See TracChangeset for help on using the changeset viewer.