Changeset 80


Ignore:
Timestamp:
Sep 3, 2007, 4:23:12 AM (13 years ago)
Author:
Bruno Cornec
Message:

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

Location:
devel/pb
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r79 r80  
    4343my @date=(localtime->sec(), localtime->min(), localtime->hour(), localtime->mday(), localtime->mon(), localtime->year(), localtime->wday(), localtime->yday(), localtime->isdst());
    4444my $pbdate = strftime("%Y-%m-%d", @date);
    45 $ENV{'PBDATE'}=$pbdate;
    4645
    4746getopts('hl:p:qr:tv',\%opts);
     
    129128        print $LOG "Management of $pbpkg $pbver-$pbtag (rev $pbrev)\n" if ($debug >= 0);
    130129        die "Unable to get env var PBDESTDIR" if (not defined $ENV{'PBDESTDIR'});
    131         # Put some var in env to allow filtering
    132         $ENV{'PBVER'}=$pbver;
    133         $ENV{'PBTAG'}=$pbtag;
    134         $ENV{'PBPKG'}=$pbpkg;
    135         $ENV{'PBREV'}=$pbrev;
    136130        # Clean up dest if necessary. The export will recreate it
    137131        my $dest = "$ENV{'PBDESTDIR'}/$pbpkg-$pbver";
     
    217211            if (defined $ptr) {
    218212                foreach my $f (values %bfiles) {
    219                     pb_filter_file_pb("$ENV{'PBROOT'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$dsuf);
     213                    pb_filter_file_pb("$ENV{'PBROOT'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$dsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate);
    220214                }
    221215                if (defined $filteredfiles{$dir}) {
    222216                    foreach my $f (split(/,/,$filteredfiles{$dir})) {
    223                         pb_filter_file("$ENV{'PBROOT'}/$dir/$f",$ptr,"$dest/$f");
     217                        pb_filter_file("$ENV{'PBROOT'}/$dir/$f",$ptr,"$dest/$f",$pbdate,$pbdate,$pbdate,$pbdate,$pbdate);
    224218                    }
    225219                }
  • devel/pb/lib/ProjectBuilder/Base.pm

    r79 r80  
    359359my $dtype=shift;
    360360my $dsuf=shift;
     361my $pbpkg=shift;
     362my $pbver=shift;
     363my $pbtag=shift;
     364my $pbrev=shift;
     365my $pbdate=shift;
    361366
    362367print $LOG "DEBUG: From $f to $destfile\n" if ($debug >= 1);
     
    397402my %filter=%$ptr;
    398403my $destfile=shift;
     404my $pbpkg=shift;
     405my $pbver=shift;
     406my $pbtag=shift;
     407my $pbrev=shift;
     408my $pbdate=shift;
    399409
    400410print $LOG "DEBUG: From $f to $destfile\n" if ($debug >= 1);
Note: See TracChangeset for help on using the changeset viewer.