Changeset 300 in ProjectBuilder for devel/pb/bin/pb

Timestamp:

Jan 27, 2008, 9:22:16 PM (16 years ago)

Author:

Bruno Cornec

Message:

Adds support for supplemental files in projects (such as init scripts different for different distributions such as in collectl)

File:

• devel/pb/bin/pb (modified) (8 diffs)

devel/pb/bin/pb

@@ -99 +99 @@
 die pb_syntax() if (not defined $action);
 
-my ($pbrc, $filteredfiles, $defpkgdir, $extpkgdir);
+my ($pbrc, $filteredfiles, $supfiles, $defpkgdir, $extpkgdir);
 my $pbinit = undef;
 $pbinit = 1 if ($action =~ /^newproj$/);
@@ -106 +106 @@
 # And get global params
 if (defined $opts{'p'}) {
-    ($ENV{'PBPROJ'},$debug,$LOG, $pbrc, $filteredfiles, $defpkgdir, $extpkgdir) 
+    ($ENV{'PBPROJ'},$debug,$LOG, $pbrc, $filteredfiles, $supfiles, $defpkgdir, $extpkgdir) 
     = pb_env_init($opts{'p'},$pbinit);
 } else {
-    ($ENV{'PBPROJ'},$debug,$LOG, $pbrc, $filteredfiles, $defpkgdir, $extpkgdir) 
+    ($ENV{'PBPROJ'},$debug,$LOG, $pbrc, $filteredfiles, $supfiles, $defpkgdir, $extpkgdir) 
     = pb_env_init(undef,$pbinit);
 }
@@ -233 +233 @@
 
             # Find all build files first relatively to PBROOT
+            # Find also all specific files referenced in the .pb conf file
             my %bfiles;
+            my %pkgfiles;
             print $LOG "DEBUG dir: $ENV{'PBCONF'}/$pbpkg\n" if ($debug >= 1);
             $build{"$ddir-$dver"} = "yes";
@@ -242 +244 @@
                     $bfiles{$f} = "$ENV{'PBCONF'}/$pbpkg/$dtype/$f";
                     $bfiles{$f} =~ s~$ENV{'PBROOT'}~~;
+                    if (defined $supfiles->{$pbpkg}) {
+                        $pkgfiles{$f} = "$ENV{'PBCONF'}/$pbpkg/$dtype/$f" if ($f =~ /$supfiles->{$pbpkg}/);
+                    }
                 }
                 closedir(BDIR);
@@ -250 +255 @@
                     $bfiles{$f} = "$ENV{'PBCONF'}/$pbpkg/$dfam/$f";
                     $bfiles{$f} =~ s~$ENV{'PBROOT'}~~;
+                    if (defined $supfiles->{$pbpkg}) {
+                        $pkgfiles{$f} = "$ENV{'PBCONF'}/$pbpkg/$dfam/$f" if ($f =~ /$supfiles->{$pbpkg}/);
+                    }
                 }
                 closedir(BDIR);
@@ -258 +266 @@
                     $bfiles{$f} = "$ENV{'PBCONF'}/$pbpkg/$ddir/$f";
                     $bfiles{$f} =~ s~$ENV{'PBROOT'}~~;
+                    if (defined $supfiles->{$pbpkg}) {
+                        $pkgfiles{$f} = "$ENV{'PBCONF'}/$pbpkg/$ddir/$f" if ($f =~ /$supfiles->{$pbpkg}/);
+                    }
                 }
                 closedir(BDIR);
@@ -266 +277 @@
                     $bfiles{$f} = "$ENV{'PBCONF'}/$pbpkg/$ddir-$dver/$f";
                     $bfiles{$f} =~ s~$ENV{'PBROOT'}~~;
+                    if (defined $supfiles->{$pbpkg}) {
+                        $pkgfiles{$f} = "$ENV{'PBCONF'}/$pbpkg/$ddir-$dver/$f" if ($f =~ /$supfiles->{$pbpkg}/);
+                    }
                 }
                 closedir(BDIR);
@@ -280 +294 @@
             # destination dir depends on the type of file
             if (defined $ptr) {
-                foreach my $f (values %bfiles) {
+                foreach my $f (values %bfiles,values %pkgfiles) {
                     pb_filter_file_pb("$ENV{'PBROOT'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$pbsuf,$ENV{'PBPROJ'},$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$defpkgdir,$extpkgdir,$pbpackager,$chglog);
                 }