[Box Backup-commit] COMMIT r2660 - in box/RELEASE/0.11rc7: bin/bbackupd bin/bbackupquery bin/bbstored infrastructure lib/backupclient lib/common lib/compress lib/crypto lib/httpserver lib/raidfile lib/server test/basicserver

subversion at boxbackup.org subversion at boxbackup.org
Mon Mar 8 21:32:40 GMT 2010


Author: chris
Date: 2010-03-08 21:32:40 +0000 (Mon, 08 Mar 2010)
New Revision: 2660

Modified:
   box/RELEASE/0.11rc7/bin/bbackupd/Makefile.extra
   box/RELEASE/0.11rc7/bin/bbackupquery/Makefile.extra
   box/RELEASE/0.11rc7/bin/bbstored/Makefile.extra
   box/RELEASE/0.11rc7/infrastructure/makebuildenv.pl.in
   box/RELEASE/0.11rc7/lib/backupclient/Makefile.extra
   box/RELEASE/0.11rc7/lib/common/Makefile.extra
   box/RELEASE/0.11rc7/lib/compress/Makefile.extra
   box/RELEASE/0.11rc7/lib/crypto/Makefile.extra
   box/RELEASE/0.11rc7/lib/httpserver/Makefile.extra
   box/RELEASE/0.11rc7/lib/raidfile/Makefile.extra
   box/RELEASE/0.11rc7/lib/server/Makefile.extra
   box/RELEASE/0.11rc7/test/basicserver/Makefile.extra
Log:
Merge [2598] [2640] from trunk into 0.11rc7. Run Perl scripts quietly 
during make.


Modified: box/RELEASE/0.11rc7/bin/bbackupd/Makefile.extra
===================================================================
--- box/RELEASE/0.11rc7/bin/bbackupd/Makefile.extra	2010-03-08 21:30:42 UTC (rev 2659)
+++ box/RELEASE/0.11rc7/bin/bbackupd/Makefile.extra	2010-03-08 21:32:40 UTC (rev 2660)
@@ -3,5 +3,5 @@
 
 # AUTOGEN SEEDING
 autogen_ClientException.h autogen_ClientException.cpp:	$(MAKEEXCEPTION) ClientException.txt
-	$(PERL) $(MAKEEXCEPTION) ClientException.txt
+	$(_PERL) $(MAKEEXCEPTION) ClientException.txt
 

Modified: box/RELEASE/0.11rc7/bin/bbackupquery/Makefile.extra
===================================================================
--- box/RELEASE/0.11rc7/bin/bbackupquery/Makefile.extra	2010-03-08 21:30:42 UTC (rev 2659)
+++ box/RELEASE/0.11rc7/bin/bbackupquery/Makefile.extra	2010-03-08 21:32:40 UTC (rev 2660)
@@ -1,6 +1,6 @@
 
 # AUTOGEN SEEDING
 autogen_Documentation.cpp:	makedocumentation.pl documentation.txt
-	$(PERL) makedocumentation.pl
+	$(_PERL) makedocumentation.pl
 
 

Modified: box/RELEASE/0.11rc7/bin/bbstored/Makefile.extra
===================================================================
--- box/RELEASE/0.11rc7/bin/bbstored/Makefile.extra	2010-03-08 21:30:42 UTC (rev 2659)
+++ box/RELEASE/0.11rc7/bin/bbstored/Makefile.extra	2010-03-08 21:32:40 UTC (rev 2660)
@@ -5,5 +5,5 @@
 
 # AUTOGEN SEEDING
 autogen_BackupProtocolServer.cpp autogen_BackupProtocolServer.h:	$(MAKEPROTOCOL) backupprotocol.txt
-	$(PERL) $(GEN_CMD_SRV)
+	$(_PERL) $(GEN_CMD_SRV)
 

Modified: box/RELEASE/0.11rc7/infrastructure/makebuildenv.pl.in
===================================================================
--- box/RELEASE/0.11rc7/infrastructure/makebuildenv.pl.in	2010-03-08 21:30:42 UTC (rev 2659)
+++ box/RELEASE/0.11rc7/infrastructure/makebuildenv.pl.in	2010-03-08 21:32:40 UTC (rev 2660)
@@ -55,7 +55,7 @@
 	my $dir = $1;
 	open FL,$file or die "Can't open $_ for reading";
 	my %vars;
-	$vars{PERL} = "@PERL@";
+	$vars{_PERL} = "@PERL@";
 	my $do_cmds = 0;
 	while(<FL>)
 	{
@@ -590,6 +590,7 @@
 _WINDRES = \$(WINDRES)
 _AR      = \$(AR)
 _RANLIB  = \$(RANLIB)
+_PERL    = \$(PERL)
 .else
 HIDE     = @
 _CXX     = @ echo "  [CXX]    " \$(*F) && \$(CXX)
@@ -597,6 +598,7 @@
 _WINDRES = @ echo "  [WINDRES]" \$(*F) && \$(WINDRES)
 _AR      = @ echo "  [AR]     " \$(*F) && \$(AR)
 _RANLIB  = @ echo "  [RANLIB] " \$(*F) && \$(RANLIB)
+_PERL    = @ echo "  [PERL]   " \$(*F) && \$(PERL) >/dev/null
 .endif
 
 __E
@@ -610,6 +612,7 @@
 _WINDRES = \$(if \$(V),\$(WINDRES), @ echo "  [WINDRES] \$<" && \$(WINDRES))
 _AR      = \$(if \$(V),\$(AR),      @ echo "  [AR]      \$@" && \$(AR))
 _RANLIB  = \$(if \$(V),\$(RANLIB),  @ echo "  [RANLIB]  \$@" && \$(RANLIB))
+_PERL    = \$(if \$(V),\$(PERL),    @ echo "  [PERL]    \$@" && \$(PERL) >/dev/null)
 
 __E
 	}

Modified: box/RELEASE/0.11rc7/lib/backupclient/Makefile.extra
===================================================================
--- box/RELEASE/0.11rc7/lib/backupclient/Makefile.extra	2010-03-08 21:30:42 UTC (rev 2659)
+++ box/RELEASE/0.11rc7/lib/backupclient/Makefile.extra	2010-03-08 21:32:40 UTC (rev 2660)
@@ -5,12 +5,12 @@
 
 # AUTOGEN SEEDING
 autogen_BackupProtocolClient.cpp autogen_BackupProtocolClient.h:	$(MAKEPROTOCOL) ../../bin/bbstored/backupprotocol.txt
-	$(PERL) $(GEN_CMD_SRV)
+	$(_PERL) $(GEN_CMD_SRV)
 
 
 MAKEEXCEPTION = ../../lib/common/makeexception.pl
 
 # AUTOGEN SEEDING
 autogen_BackupStoreException.h autogen_BackupStoreException.cpp:	$(MAKEEXCEPTION) BackupStoreException.txt
-	$(PERL) $(MAKEEXCEPTION) BackupStoreException.txt
+	$(_PERL) $(MAKEEXCEPTION) BackupStoreException.txt
 

Modified: box/RELEASE/0.11rc7/lib/common/Makefile.extra
===================================================================
--- box/RELEASE/0.11rc7/lib/common/Makefile.extra	2010-03-08 21:30:42 UTC (rev 2659)
+++ box/RELEASE/0.11rc7/lib/common/Makefile.extra	2010-03-08 21:32:40 UTC (rev 2660)
@@ -3,9 +3,9 @@
 
 # AUTOGEN SEEDING
 autogen_CommonException.h autogen_CommonException.cpp:	$(MAKEEXCEPTION) CommonException.txt
-	$(PERL) $(MAKEEXCEPTION) CommonException.txt
+	$(_PERL) $(MAKEEXCEPTION) CommonException.txt
 
 # AUTOGEN SEEDING
 autogen_ConversionException.h autogen_ConversionException.cpp:	$(MAKEEXCEPTION) ConversionException.txt
-	$(PERL) $(MAKEEXCEPTION) ConversionException.txt
+	$(_PERL) $(MAKEEXCEPTION) ConversionException.txt
 

Modified: box/RELEASE/0.11rc7/lib/compress/Makefile.extra
===================================================================
--- box/RELEASE/0.11rc7/lib/compress/Makefile.extra	2010-03-08 21:30:42 UTC (rev 2659)
+++ box/RELEASE/0.11rc7/lib/compress/Makefile.extra	2010-03-08 21:32:40 UTC (rev 2660)
@@ -3,5 +3,5 @@
 
 # AUTOGEN SEEDING
 autogen_CompressException.h autogen_CompressException.cpp:	$(MAKEEXCEPTION) CompressException.txt
-	$(PERL) $(MAKEEXCEPTION) CompressException.txt
+	$(_PERL) $(MAKEEXCEPTION) CompressException.txt
 

Modified: box/RELEASE/0.11rc7/lib/crypto/Makefile.extra
===================================================================
--- box/RELEASE/0.11rc7/lib/crypto/Makefile.extra	2010-03-08 21:30:42 UTC (rev 2659)
+++ box/RELEASE/0.11rc7/lib/crypto/Makefile.extra	2010-03-08 21:32:40 UTC (rev 2660)
@@ -3,5 +3,5 @@
 
 # AUTOGEN SEEDING
 autogen_CipherException.cpp autogen_CipherException.h:	$(MAKEEXCEPTION) CipherException.txt
-	$(PERL) $(MAKEEXCEPTION) CipherException.txt
+	$(_PERL) $(MAKEEXCEPTION) CipherException.txt
 

Modified: box/RELEASE/0.11rc7/lib/httpserver/Makefile.extra
===================================================================
--- box/RELEASE/0.11rc7/lib/httpserver/Makefile.extra	2010-03-08 21:30:42 UTC (rev 2659)
+++ box/RELEASE/0.11rc7/lib/httpserver/Makefile.extra	2010-03-08 21:32:40 UTC (rev 2660)
@@ -3,5 +3,5 @@
 
 # AUTOGEN SEEDING
 autogen_HTTPException.h autogen_HTTPException.cpp:	$(MAKEEXCEPTION) HTTPException.txt
-	perl $(MAKEEXCEPTION) HTTPException.txt
+	$(_PERL) $(MAKEEXCEPTION) HTTPException.txt
 

Modified: box/RELEASE/0.11rc7/lib/raidfile/Makefile.extra
===================================================================
--- box/RELEASE/0.11rc7/lib/raidfile/Makefile.extra	2010-03-08 21:30:42 UTC (rev 2659)
+++ box/RELEASE/0.11rc7/lib/raidfile/Makefile.extra	2010-03-08 21:32:40 UTC (rev 2660)
@@ -3,5 +3,5 @@
 
 # AUTOGEN SEEDING
 autogen_RaidFileException.h autogen_RaidFileException.cpp:	$(MAKEEXCEPTION) RaidFileException.txt
-	$(PERL) $(MAKEEXCEPTION) RaidFileException.txt
+	$(_PERL) $(MAKEEXCEPTION) RaidFileException.txt
 

Modified: box/RELEASE/0.11rc7/lib/server/Makefile.extra
===================================================================
--- box/RELEASE/0.11rc7/lib/server/Makefile.extra	2010-03-08 21:30:42 UTC (rev 2659)
+++ box/RELEASE/0.11rc7/lib/server/Makefile.extra	2010-03-08 21:32:40 UTC (rev 2660)
@@ -3,9 +3,9 @@
 
 # AUTOGEN SEEDING
 autogen_ServerException.h autogen_ServerException.cpp:	$(MAKEEXCEPTION) ServerException.txt
-	$(PERL) $(MAKEEXCEPTION) ServerException.txt
+	$(_PERL) $(MAKEEXCEPTION) ServerException.txt
 
 # AUTOGEN SEEDING
 autogen_ConnectionException.h autogen_ConnectionException.cpp:	$(MAKEEXCEPTION) ConnectionException.txt
-	$(PERL) $(MAKEEXCEPTION) ConnectionException.txt
+	$(_PERL) $(MAKEEXCEPTION) ConnectionException.txt
 

Modified: box/RELEASE/0.11rc7/test/basicserver/Makefile.extra
===================================================================
--- box/RELEASE/0.11rc7/test/basicserver/Makefile.extra	2010-03-08 21:30:42 UTC (rev 2659)
+++ box/RELEASE/0.11rc7/test/basicserver/Makefile.extra	2010-03-08 21:32:40 UTC (rev 2660)
@@ -6,16 +6,16 @@
 
 # AUTOGEN SEEDING
 autogen_TestProtocolServer.cpp:	$(MAKEPROTOCOL) testprotocol.txt
-	$(PERL) $(GEN_CMD_SRV)
+	$(_PERL) $(GEN_CMD_SRV)
 
 autogen_TestProtocolServer.h:	$(MAKEPROTOCOL) testprotocol.txt
-	$(PERL) $(GEN_CMD_SRV)
+	$(_PERL) $(GEN_CMD_SRV)
 
 
 # AUTOGEN SEEDING
 autogen_TestProtocolClient.cpp:	$(MAKEPROTOCOL) testprotocol.txt
-	$(PERL) $(GEN_CMD_CLI)
+	$(_PERL) $(GEN_CMD_CLI)
 
 autogen_TestProtocolClient.h:	$(MAKEPROTOCOL) testprotocol.txt
-	$(PERL) $(GEN_CMD_CLI)
+	$(_PERL) $(GEN_CMD_CLI)
 




More information about the Boxbackup-commit mailing list