Changeset 80

Timestamp:

09/03/07 04:23:12 (6 years ago)

Author:

bruno

Message:

Back to variables sue to pb with var substitution for env var

Location:

devel/pb

Files:

• bin/pb (modified) (3 diffs)
• lib/ProjectBuilder/Base.pm (modified) (2 diffs)

devel/pb/bin/pb

@@ -43 +43 @@
 my @date=(localtime->sec(), localtime->min(), localtime->hour(), localtime->mday(), localtime->mon(), localtime->year(), localtime->wday(), localtime->yday(), localtime->isdst());
 my $pbdate = strftime("%Y-%m-%d", @date);
-$ENV{'PBDATE'}=$pbdate;
 
 getopts('hl:p:qr:tv',\%opts);
@@ -129 +128 @@
         print $LOG "Management of $pbpkg $pbver-$pbtag (rev $pbrev)\n" if ($debug >= 0);
         die "Unable to get env var PBDESTDIR" if (not defined $ENV{'PBDESTDIR'});
-        # Put some var in env to allow filtering
-        $ENV{'PBVER'}=$pbver;
-        $ENV{'PBTAG'}=$pbtag;
-        $ENV{'PBPKG'}=$pbpkg;
-        $ENV{'PBREV'}=$pbrev;
         # Clean up dest if necessary. The export will recreate it
         my $dest = "$ENV{'PBDESTDIR'}/$pbpkg-$pbver";
@@ -217 +211 @@
             if (defined $ptr) {
                 foreach my $f (values %bfiles) {
-                    pb_filter_file_pb("$ENV{'PBROOT'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$dsuf);
+                    pb_filter_file_pb("$ENV{'PBROOT'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$dsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate);
                 }
                 if (defined $filteredfiles{$dir}) {
                     foreach my $f (split(/,/,$filteredfiles{$dir})) {
-                        pb_filter_file("$ENV{'PBROOT'}/$dir/$f",$ptr,"$dest/$f");
+                        pb_filter_file("$ENV{'PBROOT'}/$dir/$f",$ptr,"$dest/$f",$pbdate,$pbdate,$pbdate,$pbdate,$pbdate);
                     }
                 }

devel/pb/lib/ProjectBuilder/Base.pm

@@ -359 +359 @@
 my $dtype=shift;
 my $dsuf=shift;
+my $pbpkg=shift;
+my $pbver=shift;
+my $pbtag=shift;
+my $pbrev=shift;
+my $pbdate=shift;
 
 print $LOG "DEBUG: From $f to $destfile\n" if ($debug >= 1);
@@ -397 +402 @@
 my %filter=%$ptr;
 my $destfile=shift;
+my $pbpkg=shift;
+my $pbver=shift;
+my $pbtag=shift;
+my $pbrev=shift;
+my $pbdate=shift;
 
 print $LOG "DEBUG: From $f to $destfile\n" if ($debug >= 1);