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

[boxbackup-dev@boxbackup.org]

Author: chris
Date: 2008-10-08 20:57:34 +0100 (Wed, 08 Oct 2008)
New Revision: 2338

Modified:
   box/trunk/infrastructure/makeparcels.pl.in
   box/trunk/parcels.txt
Log:
Include LICENSE.txt in parcels, but don't install it.


Modified: box/trunk/infrastructure/makeparcels.pl.in
===================================================================
--- box/trunk/infrastructure/makeparcels.pl.in	2008-10-07 18:48:42 UTC (rev 2337)
+++ box/trunk/infrastructure/makeparcels.pl.in	2008-10-08 19:57:34 UTC (rev 2338)
@@ -123,14 +123,26 @@
 
 	for(@{$parcel_contents{$parcel}})
 	{
-		my ($type,$name,$dest) = split /\s+/;
-		my $optional = '';
+		my @args = split /\s+/;
 
+		my ($type,$name,$dest) = @args;
+		my $optional = 0;
+		my $install  = 1;
+
 		if ($type eq 'optional')
 		{
-			($optional,$type,$name,$dest) = split /\s+/;
+			$optional = 1;
+			shift @args;
+			($type,$name,$dest) = @args;
 		}
 
+		if ($type eq 'noinstall')
+		{
+			$install = 0;
+			shift @args;
+			($type,$name,$dest) = @args;
+		}
+
 		if($type eq 'bin')
 		{
 			my $exeext = $platform_exe_ext;
@@ -184,20 +196,32 @@
 	for(@{$parcel_contents{$parcel}})
 	{
 		my ($type,$name,$dest) = split /\s+/;
-		my $optional = '';
 
+		my $optional = 0;
+		my $install  = 1;
+
 		if ($type eq 'optional')
 		{
-			($optional,$type,$name,$dest) = split /\s+/;
+			$optional = 1;
+			shift @args;
+			($type,$name,$dest) = @args;
 		}
 
+		if ($type eq 'noinstall')
+		{
+			$install = 0;
+			shift @args;
+			($type,$name,$dest) = @args;
+		}
+
+
 		if ($type eq 'script')
 		{
 			# remove path from script name
 			$name =~ s{.*/}{};
 		}
 
-		unless ($target_windows)
+		if ($install and not $target_windows)
 		{
 			my $local_install_dir = $install_into_dir;
 			if (defined $dest)

Modified: box/trunk/parcels.txt
===================================================================
--- box/trunk/parcels.txt	2008-10-07 18:48:42 UTC (rev 2337)
+++ box/trunk/parcels.txt	2008-10-08 19:57:34 UTC (rev 2338)
@@ -8,6 +8,7 @@
 	bin bbackupquery
 	bin bbackupctl
 	script bin/bbackupd/bbackupd-config
+	noinstall script LICENSE.txt
 
 ONLY:mingw32,mingw32msvc
 	script bin/bbackupd/win32/installer.iss 
@@ -31,6 +32,7 @@
 	script bin/bbstored/bbstored-certs
 	script bin/bbstored/bbstored-config
 	script lib/raidfile/raidfile-config
+	noinstall script LICENSE.txt
 
 ONLY:SunOS
 	script contrib/solaris/bbstored-manifest.xml lib/svc/manifest