Changeset 2338 for box/trunk/infrastructure

Timestamp:

08/10/2008 20:57:34 (4 years ago)

Author:

chris

Message:

Include LICENSE.txt in parcels, but don't install it.

File:

• box/trunk/infrastructure/makeparcels.pl.in (modified) (3 diffs)

box/trunk/infrastructure/makeparcels.pl.in

@@ -124 +124 @@
         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;
                 }
 
@@ -185 +197 @@
         {
                 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')
@@ -198 +222 @@
                 }
 
-                unless ($target_windows)
+                if ($install and not $target_windows)
                 {
                         my $local_install_dir = $install_into_dir;