Changeset 2657 for box/RELEASE/0.11rc7/infrastructure/makedistribution.pl.in

Timestamp:

08/03/2010 21:28:01 (2 years ago)

Author:

chris

Message:

Merge [2596] [2599] [2600] from trunk into 0.11rc7, implements license
change.

File:

• box/RELEASE/0.11rc7/infrastructure/makedistribution.pl.in (modified) (6 diffs)

box/RELEASE/0.11rc7/infrastructure/makedistribution.pl.in

@@ -13 +13 @@
 
 # files which don't get the license added
-my %no_license = (); # 'filename' => 1
+# my %file_license = (); # 'filename' => 'GPL', 'DUAL' or 'none'
 
 # ----------------------------------------------
 
 # filled in from the manifest file
-my %no_license_dir = ();
+# my %dir_license = (); # 'dir' => 'GPL', 'DUAL' or 'none'
+#
+# most recently specified LICENSE become default until overridden
+my $current_license; # 'GPL', 'DUAL' or 'none'
 
 # distribution name
@@ -69 +72 @@
 mkdir $base_name,0755;
 
-# get license file
-open LICENSE,"$dist_root/LICENSE.txt" or die "Can't open $dist_root/LICENSE.txt";
-my $license_f;
-read LICENSE,$license_f,100000;
-close LICENSE;
-my @license = ('distribution '.$base_name.' (svn version: '.$svnversion.')',split(/\n/,$license_f));
+# get license files
+my %license_text; # name of license => array of lines of license text
+foreach my $license ("GPL", "DUAL")
+{
+        my $file = "./LICENSE-$license.txt";
+        open LICENSE, $file or die "Can't open $file: $!";
+        my @lines = <LICENSE>;
+        close LICENSE;
+        unshift @lines, "distribution $base_name (svn version: $svnversion)\n";
+        $license_text{$license} = \@lines;
+}
 
 # copy files, make a note of all the modules included
@@ -89 +97 @@
                 next unless $line =~ m/\S/;
                 chomp $line;
-                my ($src,$dst,$other) = split /\s+/, $line;
+                my @words = split /\s+/, $line;
+                my ($src,$dst,$other) = @words;
                 $dst = $src if $dst eq '';
                 if($src eq 'MKDIR')
@@ -96 +105 @@
                         mkdir "$base_name/$dst",0755;
                 }
-                elsif($src eq 'NO-LICENSE-IN-DIR')
-                {
-                        my ($junk,$spec) = split /\s+/, $line;
-                        # record that this directory shouldn't have the license added
-                        $no_license_dir{$dst} = 1;
-
-                        # actually copy it, to remove redundancy in manifests
-                        $src = $dst;
-                        $dst = $other;
-                        $dst = $src if $dst eq '';
-                        $modules_included{$spec} = 1;
-                        copy_dir($src,$dst);
+                elsif($src eq 'LICENSE')
+                {
+                        $current_license = $dst;
                 }
                 elsif($src eq 'REPLACE-VERSION-IN')
                 {
                         replace_version_in($dst);
-                }
-                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')
@@ -190 +179 @@
         my $ext;
         $ext = $1 if $fn =~ m/\.(\w+)\Z/;
-        
-        # licenses not used in this directory?
-        my $license_in_dir = 1;
         $dst_fn =~ m~\A(.+)/[^/]+?\Z~;
-        $license_in_dir = 0 if exists $no_license_dir{$1};
         
         # licensed or not?
-        if(exists $comment_chars{$ext} && !exists $no_license{$fn} && $license_in_dir)
+        if(exists $comment_chars{$ext} && $current_license ne "none")
         {
                 # copy as text, inserting license
@@ -215 +200 @@
                 # write license
                 my $b = $comment_chars{$ext};
-                for(@license)
-                {
-                        print OUT $b,$_,"\n"
+                my $this_license = $license_text{$current_license};
+                for (@$this_license)
+                {
+                        print OUT $b, $_;
                 }