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

boxbackup-dev at boxbackup.org boxbackup-dev at boxbackup.org
Mon Oct 27 21:17:04 GMT 2008


Author: jamesog
Date: 2008-10-27 21:17:03 +0000 (Mon, 27 Oct 2008)
New Revision: 2368

Modified:
   box/trunk/distribution/COMMON-MANIFEST.txt
   box/trunk/distribution/boxbackup/CONTACT.txt
   box/trunk/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt
   box/trunk/distribution/boxbackup/VERSION.txt
   box/trunk/docs/Makefile
   box/trunk/infrastructure/makedistribution.pl.in
Log:
Update distribution generator.


Modified: box/trunk/distribution/COMMON-MANIFEST.txt
===================================================================
--- box/trunk/distribution/COMMON-MANIFEST.txt	2008-10-27 21:16:19 UTC (rev 2367)
+++ box/trunk/distribution/COMMON-MANIFEST.txt	2008-10-27 21:17:03 UTC (rev 2368)
@@ -1,4 +1,5 @@
 RUN ./bootstrap
+RUN cd docs; make
 lib/common
 lib/crypto
 lib/server
@@ -11,15 +12,17 @@
 test/crypto
 test/compress
 test/win32
-docs/common notes
-docs/common/lib_common notes/lib_common
-docs/common/lib_crypto notes/lib_crypto
-docs/common/lib_server notes/lib_server
+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
 MKDIR infrastructure
 infrastructure/buildenv-testmain-template.cpp
 infrastructure/makebuildenv.pl.in
 infrastructure/makedistribution.pl.in
 infrastructure/makeparcels.pl.in
+infrastructure/parcelpath.pl
+infrastructure/printversion.pl
 infrastructure/BoxPlatform.pm.in
 infrastructure/mingw
 infrastructure/msvc

Modified: box/trunk/distribution/boxbackup/CONTACT.txt
===================================================================
--- box/trunk/distribution/boxbackup/CONTACT.txt	2008-10-27 21:16:19 UTC (rev 2367)
+++ box/trunk/distribution/boxbackup/CONTACT.txt	2008-10-27 21:17:03 UTC (rev 2368)
@@ -1,6 +1,6 @@
 
-http://www.fluffy.co.uk/boxbackup/
+http://www.boxbackup.org/
 
-Ben Summers
-ben at fluffy.co.uk
+Ben Summers & contributors
+boxbackup at boxbackup.org
 

Modified: box/trunk/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt
===================================================================
--- box/trunk/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt	2008-10-27 21:16:19 UTC (rev 2367)
+++ box/trunk/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt	2008-10-27 21:17:03 UTC (rev 2368)
@@ -19,12 +19,15 @@
 test/bbackupd
 test/bbackupd/testfiles
 test/backupdiff
-docs/raidfile notes
-docs/raidfile/lib_raidfile notes/lib_raidfile
-docs/backup notes
-documentation
-documentation/html
-documentation/html/images
+docs/api-docs/raidfile docs/api-notes
+docs/api-docs/raidfile/lib_raidfile docs/api-notes/lib_raidfile
+docs/api-docs/backup docs/api-notes
+docs/box-html docs/htmlguide
+docs/box-html/adminguide docs/htmlguide/adminguide
+docs/box-html/images docs/htmlguide/images
+docs/box-html/instguide docs/htmlguide/instguide
+docs/box-html/man-html docs/htmlguide/manpages
+docs/man
 TODO.txt
 BUGS.txt
 contrib
@@ -35,6 +38,9 @@
 NO-LICENSE-IN-DIR contrib/solaris
 NO-LICENSE-IN-DIR contrib/suse
 NO-LICENSE-IN-DIR contrib/bbreporter
+NO-LICENSE-IN-DIR contrib/windows
+NO-LICENSE-IN-DIR contrib/windows/installer
+NO-LICENSE-IN-DIR contrib/windows/installer/tools
 infrastructure/msvc
 NO-LICENSE-IN-DIR infrastructure/msvc/2003
 NO-LICENSE-IN-DIR infrastructure/msvc/2005

Modified: box/trunk/distribution/boxbackup/VERSION.txt
===================================================================
--- box/trunk/distribution/boxbackup/VERSION.txt	2008-10-27 21:16:19 UTC (rev 2367)
+++ box/trunk/distribution/boxbackup/VERSION.txt	2008-10-27 21:17:03 UTC (rev 2368)
@@ -1,2 +1,2 @@
-0.10_plus_USE_SVN_VERSION
+0.11_USE_SVN_VERSION
 boxbackup

Modified: box/trunk/docs/Makefile
===================================================================
--- box/trunk/docs/Makefile	2008-10-27 21:16:19 UTC (rev 2367)
+++ box/trunk/docs/Makefile	2008-10-27 21:17:03 UTC (rev 2368)
@@ -21,9 +21,9 @@
 all: docs
 
 docs: instguide adminguide manpages
-	mkdir -p $(HTMLPREFIX)/images
-	cp html/images/*.png $(HTMLPREFIX)/images/.
-	cp html/*.css $(HTMLPREFIX)/.
+	@mkdir -p $(HTMLPREFIX)/images
+	@cp html/images/*.png $(HTMLPREFIX)/images/.
+	@cp html/*.css $(HTMLPREFIX)/.
 
 adminguide: $(HTMLPREFIX)/adminguide/index.html 
 

Modified: box/trunk/infrastructure/makedistribution.pl.in
===================================================================
--- box/trunk/infrastructure/makedistribution.pl.in	2008-10-27 21:16:19 UTC (rev 2367)
+++ box/trunk/infrastructure/makedistribution.pl.in	2008-10-27 21:17:03 UTC (rev 2368)
@@ -332,7 +332,11 @@
 		next if m/\AMakefile\Z/;
 		next if m/\Aautogen/;
 		next if m/-smf-method\Z/; # copy only the .in versions
-		next if m/-manifest.xml\Z/; # copy onlt the .in versions
+		next if m/-manifest.xml\Z/; # copy only the .in versions
+		if($dir eq 'docs') {
+			next if m/.(x[sm]l|tmpl)\Z/; # don't include doc sources
+			next if m/generate_except_xml.pl/;
+		}
 		next if !-f "$dir/$_";
 		
 		copy_file("$dir/$_","$dst_dir/$_");




More information about the Boxbackup-commit mailing list