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

Timestamp:

Apr 27, 2008, 1:18:10 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Reintegrates $pbproj as variable for filter functions (needed for PBPROJ expansion)
• Fix pbinit using perl functions support
• Adds a virtual pbinit action support in pb_env_init

File:

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

devel/pb/bin/pb

@@ -552 +552 @@
             if (defined $ptr) {
                 foreach my $f (values %bfiles,values %pkgfiles) {
-                    pb_filter_file_pb("$ENV{'PBROOTDIR'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$pbsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$defpkgdir,$extpkgdir,$ENV{'PBPACKAGER'},$chglog);
+                    pb_filter_file_pb("$ENV{'PBROOTDIR'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$pbsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$defpkgdir,$extpkgdir,$ENV{'PBPACKAGER'},$chglog,$ENV{'PBPROJ'});
                 }
             }
@@ -574 +574 @@
         if (defined $filteredfiles->{$pbpkg}) {
             foreach my $f (split(/,/,$filteredfiles->{$pbpkg})) {
-                pb_filter_file_inplace($ptr,"$dest/$f",$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$ENV{'PBPACKAGER'});
+                pb_filter_file_inplace($ptr,"$dest/$f",$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$ENV{'PBPACKAGER'},$ENV{'PBPROJ'});
                 $liste = "$f $liste";
             }
@@ -582 +582 @@
         # Prepare the dest directory for archive
         if (-x "$ENV{'PBROOTDIR'}/$pbpkg/pbinit") {
-            pb_filter_file("$ENV{'PBROOTDIR'}/$pbpkg/pbinit",$ptr,"$ENV{'PBTMP'}/pbinit",$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$ENV{'PBPACKAGER'});
+            pb_filter_file("$ENV{'PBROOTDIR'}/$pbpkg/pbinit",$ptr,"$ENV{'PBTMP'}/pbinit",$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$ENV{'PBPACKAGER'},$ENV{'PBPROJ'});
             chmod 0755,"$ENV{'PBTMP'}/pbinit";
             pb_system("cd $dest ; $ENV{'PBTMP'}/pbinit","Executing init script from $ENV{'PBROOTDIR'}/$pbpkg/pbinit");
@@ -824 +824 @@
         }
     }
+    # Adds conf file for availanility of conf elements
+    pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb");
+
     if (($cmt eq "vm") || ($cmt eq "ve")) {
         $src="$src $ENV{'PBDESTDIR'}/pbscript $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb $ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb $ENV{'PBETC'} $ENV{'PBDESTDIR'}/pbrc";
-        # Adds conf file used for final delivery
-        pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb");
     } elsif ($cmt eq "Script") {
         $src="$src $ENV{'PBDESTDIR'}/pbscript";