Changeset 79 in ProjectBuilder for devel/pb/bin

Timestamp:

Sep 3, 2007, 4:09:00 AM (18 years ago)

Author:

Bruno Cornec

Message:

Use more nv variables to deal with filters easily even outside ou pb

File:

• devel/pb/bin/pb (modified) (4 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);
@@ -128 +129 @@
         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";
@@ -211 +217 @@
             if (defined $ptr) {
                 foreach my $f (values %bfiles) {
-                    pb_filter_file_pb("$ENV{'PBROOT'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$pbpkg,$pbtag,$dtype,$dsuf);
+                    pb_filter_file_pb("$ENV{'PBROOT'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$dsuf);
                 }
                 if (defined $filteredfiles{$dir}) {
@@ -247 +253 @@
     open(LAST,"> $pbrc{$ENV{'PBPROJ'}}") || die "Unable to create $pbrc{$ENV{'PBPROJ'}}";
     foreach my $v (keys %pbver) {
-        print LAST "pbroot $v-_-$pbver{v}-$pbtag{v} = $ENV{'PBROOT'}\n";
+        print LAST "pbroot $v-_-$pbver{$v}-$pbtag{$v} = $ENV{'PBROOT'}\n";
     }
     close(LAST);