Changeset 300 in ProjectBuilder for devel

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)

Location:

devel/pb

Files:

• bin/pb (modified) (8 diffs)
• lib/ProjectBuilder/Base.pm (modified) (5 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);
                 }

devel/pb/lib/ProjectBuilder/Base.pm

@@ -96 +96 @@
 my %extpkgdir = ();
 my %filteredfiles = ();
+my %supfiles = ();
 
 if ((-f "$ENV{'PBCONF'}/$proj.pb") and (not defined $pbinit)) {
@@ -102 +103 @@
     # Valid version names (optional)
     # List of files to filter (optional)
-    my ($defpkgdir, $extpkgdir, $version, $filteredfiles, $pkgv, $pkgt) = pb_conf_read("$ENV{'PBCONF'}/$proj.pb","defpkgdir","extpkgdir","version","filteredfiles","projver","projtag");
+    my ($defpkgdir, $extpkgdir, $version, $filteredfiles, $supfiles, $pkgv, $pkgt) = pb_conf_read("$ENV{'PBCONF'}/$proj.pb","defpkgdir","extpkgdir","version","filteredfiles","supfiles","projver","projtag");
     print "DEBUG: defpkgdir: ".Dumper($defpkgdir)."\n" if ($debug >= 1);
     print "DEBUG: extpkgdir: ".Dumper($extpkgdir)."\n" if ($debug >= 1);
     print "DEBUG: version: ".Dumper($version)."\n" if ($debug >= 1);
     print "DEBUG: filteredfiles: ".Dumper($filteredfiles)."\n" if ($debug >= 1);
+    print "DEBUG: supfiles: ".Dumper($supfiles)."\n" if ($debug >= 1);
     die "Unable to find defpkgdir in $ENV{'PBCONF'}/$proj.pb" if (not defined $defpkgdir);
     # Global
@@ -115 +117 @@
     # Global
     %filteredfiles = %$filteredfiles if (defined $filteredfiles);
+    %supfiles = %$supfiles if (defined $supfiles);
     #
     # Get global Version/Tag
@@ -226 +229 @@
 #filteredfiles pkg1 = Makefile.PL
 #filteredfiles pkg1-doc = configure.in
+#supfiles pkg1 = pkg1.init
 EOF
         close(CONF);
@@ -644 +648 @@
 
 umask 0022;
-return($proj,$debug,$LOG,\%pbrc, \%filteredfiles, \%defpkgdir, \%extpkgdir);
+return($proj,$debug,$LOG,\%pbrc, \%filteredfiles, \%supfiles, \%defpkgdir, \%extpkgdir);
 }