[Box Backup-commit] COMMIT r2518 - in box/trunk: . infrastructure

[boxbackup-dev@boxbackup.org]

Author: chris
Date: 2009-04-26 22:13:46 +0100 (Sun, 26 Apr 2009)
New Revision: 2518

Modified:
   box/trunk/infrastructure/makeparcels.pl.in
   box/trunk/parcels.txt
Log:
Include html docs in parcels.

Don't include man pages in parcels for Windows.


Modified: box/trunk/infrastructure/makeparcels.pl.in
===================================================================
--- box/trunk/infrastructure/makeparcels.pl.in	2009-04-26 21:12:39 UTC (rev 2517)
+++ box/trunk/infrastructure/makeparcels.pl.in	2009-04-26 21:13:46 UTC (rev 2518)
@@ -66,6 +66,19 @@
 			next;
 		}
 		next if (m'\AEND-ONLY');
+
+		if (m'\AEXCEPT:(.+)')
+		{
+			if (os_matches($1))
+			{
+				while (<PARCELS>)
+				{
+					last if m'\AEND-EXCEPT';
+				}
+			}
+			next;
+		}
+		next if (m'\AEND-EXCEPT');
 		
 		# new parcel, or a new parcel definition?
 		if(m/\A\s+(.+)\Z/)
@@ -228,6 +241,24 @@
 EOF
 			push @parcel_deps, "$dir/${name}.gz";
 		}
+		elsif($type eq 'html')
+		{
+			print MAKE <<EOF;
+$dir/docs/${name}.html: docs/htmlguide/man-html/${name}.html
+	mkdir -p $dir/docs
+	$copy_command docs/htmlguide/man-html/${name}.html $dir/docs
+
+EOF
+			# Releases have the docs pre-made, but users
+			# may want to rebuild them for some reason.
+			print MAKE <<EOF;
+.PHONY: docs/htmlguide/man-html/${name}.html
+docs/htmlguide/man-html/${name}.html:
+	\$(MAKE) -C docs htmlguide/man-html/${name}.html
+
+EOF
+			push @parcel_deps, "$dir/docs/${name}.html";
+		}
 	}
 
 	print MAKE <<EOF;

Modified: box/trunk/parcels.txt
===================================================================
--- box/trunk/parcels.txt	2009-04-26 21:12:39 UTC (rev 2517)
+++ box/trunk/parcels.txt	2009-04-26 21:13:46 UTC (rev 2518)
@@ -9,11 +9,20 @@
 	bin bbackupctl
 	script bin/bbackupd/bbackupd-config
 	noinstall script LICENSE.txt
+
+	html bbackupd
+	html bbackupquery
+	html bbackupctl
+	html bbackupd-config
+	html bbackupd.conf
+
+EXCEPT:mingw32,mingw32msvc
 	man bbackupd.8
 	man bbackupquery.8
 	man bbackupctl.8
 	man bbackupd-config.8
 	man bbackupd.conf.5
+END-EXCEPT
 
 ONLY:mingw32,mingw32msvc
 	script bin/bbackupd/win32/installer.iss 
@@ -22,6 +31,7 @@
 END-ONLY
 
 ONLY:mingw32
+	script /bin/mgwz.dll
 	script /bin/mingwm10.dll
 END-ONLY
 
@@ -41,6 +51,16 @@
 	script bin/bbstored/bbstored-config
 	script lib/raidfile/raidfile-config
 	noinstall script LICENSE.txt
+
+	html bbstored
+	html bbstoreaccounts
+	html bbstored-certs
+	html bbstored-config
+	html raidfile-config
+	html bbstored.conf
+	html raidfile.conf
+
+EXCEPT:mingw32,mingw32msvc
 	man bbstored.8
 	man bbstoreaccounts.8
 	man bbstored-certs.8
@@ -48,6 +68,7 @@
 	man raidfile-config.8
 	man bbstored.conf.5
 	man raidfile.conf.5
+END-EXCEPT
 
 ONLY:SunOS
 	script contrib/solaris/bbstored-manifest.xml lib/svc/manifest