Changeset 2470 for box/trunk/infrastructure

Timestamp:

27/03/2009 23:50:30 (3 years ago)

Author:

chris

Message:

Allow substitutions and removing private sections for distribution in
.in files. Simplify code a little and improve comments.

File:

• box/trunk/infrastructure/makedistribution.pl.in (modified) (4 diffs)

box/trunk/infrastructure/makedistribution.pl.in

@@ -8 +8 @@
 
 # other extensions which need text copying, just to remove the private stuff
-my %text_files = ('txt' => 1, 'spec' => 1);
+# .in is included here, as these could be any kind of source, but clearly
+# they have text substitutions run on them by autoconf, so we can too :)
+my %text_files = ('txt' => 1, 'spec' => 1, 'in' => 1);
 
 # files which don't get the license added
@@ -190 +192 @@
         if(exists $comment_chars{$ext} && !exists $no_license{$fn} && $license_in_dir)
         {
-                my $b = $comment_chars{$ext};
-
                 # copy as text, inserting license
+                # print "source copy $fn to $base_name/$dst_fn\n";
+
                 my $in = gensym;
                 open $in,$fn;
@@ -205 +207 @@
                 
                 # write license
+                my $b = $comment_chars{$ext};
                 for(@license)
                 {
@@ -226 +229 @@
                 close $in;
         }
+        elsif(exists $text_files{$ext})
+        {
+                # copy this as text, to remove private stuff
+                # print "text copy $fn to $base_name/$dst_fn\n";
+
+                my $in = gensym;
+                open $in,$fn;
+                open OUT,">$base_name/$dst_fn";
+
+                while(<$in>)
+                {
+                        unless(skip_non_applicable_section($_, $in, $fn))
+                        {
+                                print OUT
+                        }
+                }       
+
+                close OUT;
+                close $in;
+        }
         else
         {
-                if(exists $text_files{$ext})
-                {
-                        # copy this as text, to remove private stuff
-                        my $in = gensym;
-                        open $in,$fn;
-                        open OUT,">$base_name/$dst_fn";
-
-                        while(<$in>)
-                        {
-                                unless(skip_non_applicable_section($_, $in, $fn))
-                                {
-                                        print OUT
-                                }
-                        }       
-
-                        close OUT;
-                        close $in;
-                }
-                else
-                {
-                        # copy as binary
-                        system 'cp',$fn,"$base_name/$dst_fn"
-                }
+                # copy as binary
+                # print "binary copy $fn to $base_name/$dst_fn\n";
+                system 'cp',$fn,"$base_name/$dst_fn"
         }