[Box Backup-commit] COMMIT r2476 - in box/trunk: distribution distribution/boxbackup infrastructure

boxbackup-dev at boxbackup.org boxbackup-dev at boxbackup.org
Sat Mar 28 14:04:47 GMT 2009


Author: chris
Date: 2009-03-28 14:04:47 +0000 (Sat, 28 Mar 2009)
New Revision: 2476

Modified:
   box/trunk/distribution/COMMON-MANIFEST.txt
   box/trunk/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt
   box/trunk/infrastructure/makedistribution.pl.in
Log:
Preserve timestamps when doing a binary copy to make a distribution, so 
that the built gzipped man pages are still newer than the XML source.

Make NO-LICENSE also copy the file, to avoid redundancy in manifests.

Fix location of API docs.

Create docs/docbook directory to avoid error in making distribution.


Modified: box/trunk/distribution/COMMON-MANIFEST.txt
===================================================================
--- box/trunk/distribution/COMMON-MANIFEST.txt	2009-03-28 14:01:39 UTC (rev 2475)
+++ box/trunk/distribution/COMMON-MANIFEST.txt	2009-03-28 14:04:47 UTC (rev 2476)
@@ -12,10 +12,10 @@
 test/crypto
 test/compress
 test/win32
-docs/api-docs/common docs/api-notes
-docs/api-docs/common/lib_common docs/api-notes/lib_common
-docs/api-docs/common/lib_crypto docs/api-notes/lib_crypto
-docs/api-docs/common/lib_server docs/api-notes/lib_server
+docs/api-notes
+docs/api-notes/common/lib_common
+docs/api-notes/common/lib_crypto
+docs/api-notes/common/lib_server
 MKDIR infrastructure
 infrastructure/buildenv-testmain-template.cpp
 infrastructure/makebuildenv.pl.in
@@ -26,13 +26,11 @@
 infrastructure/BoxPlatform.pm.in
 infrastructure/mingw
 infrastructure/msvc
-configure.ac
 NO-LICENSE config.sub
-config.sub
 NO-LICENSE config.guess
-config.guess
 bootstrap
+configure.ac
+configure
 parcels.txt
 runtest.pl.in
 NO-LICENSE-IN-DIR infrastructure/m4
-configure

Modified: box/trunk/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt
===================================================================
--- box/trunk/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt	2009-03-28 14:01:39 UTC (rev 2475)
+++ box/trunk/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt	2009-03-28 14:04:47 UTC (rev 2476)
@@ -22,15 +22,14 @@
 docs/Makefile
 docs/tools
 docs/api-notes
-docs/api-notes/lib_raidfile
+docs/api-notes/raidfile/lib_raidfile
 docs/htmlguide
 docs/htmlguide/adminguide
 docs/htmlguide/images
 docs/htmlguide/instguide
 docs/htmlguide/manpages
 docs/man
-# RUN cd docs; sed -i"" -e '/^ExceptionCodes/,/^$/s/\(.*\)/# &/' Makefile
-docs/docbook/Makefile
+MKDIR docs/docbook
 docs/docbook/ExceptionCodes.xml
 docs/docbook/adminguide.xml
 docs/docbook/bb-book.xsl
@@ -51,7 +50,6 @@
 docs/docbook/raidfile.conf.xml
 docs/docbook/html
 docs/docbook/html/images
-# RUN svn revert docs/Makefile
 TODO.txt
 BUGS.txt
 contrib

Modified: box/trunk/infrastructure/makedistribution.pl.in
===================================================================
--- box/trunk/infrastructure/makedistribution.pl.in	2009-03-28 14:01:39 UTC (rev 2475)
+++ box/trunk/infrastructure/makedistribution.pl.in	2009-03-28 14:04:47 UTC (rev 2476)
@@ -115,6 +115,13 @@
 		elsif($src eq 'NO-LICENSE')
 		{
 			$no_license{$dst} = 1;
+
+			# actually copy it, to remove redundancy in manifests
+			$src = $dst;
+			$dst = $other;
+			$dst = $src if $dst eq '';
+
+			copy_file($src,$dst);
 		}
 		elsif($src eq 'RUN')
 		{
@@ -252,7 +259,8 @@
 	{
 		# copy as binary
 		# print "binary copy $fn to $base_name/$dst_fn\n";
-		system 'cp',$fn,"$base_name/$dst_fn"
+		my $cmd = "cp -p $fn $base_name/$dst_fn";
+		system($cmd) == 0 or die "copy failed: $cmd";
 	}
 	
 	# copy executable bit from src




More information about the Boxbackup-commit mailing list