Changeset 79 in ProjectBuilder

Timestamp:

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

Author:

Bruno Cornec

Message:

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

Location:

devel

Files:

• pb/bin/pb (modified) (4 diffs)
• pb/lib/ProjectBuilder/Base.pm (modified) (6 diffs)
• pbconf/project-builder/pbfilter/rpm.pbf (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);
@@ -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);

devel/pb/lib/ProjectBuilder/Base.pm

@@ -314 +314 @@
 my $dver = shift || die "No dver specified";
 my $ptr; # returned value pointer on the hash of filters
+my %ptr;
 
 if (-d "$ENV{'PBCONF'}/$pbpkg/pbfilter") {
@@ -326 +327 @@
     push @ffiles,$ffile3 if (defined $ffile3);
 }
-my $config = AppConfig->new({
-    # Auto Create variables mentioned in Conf file
-    CREATE => 1,
-    DEBUG => 0,
-    GLOBAL => {
-        # Each conf item is a hash
-        ARGCOUNT => AppConfig::ARGCOUNT_HASH
-    }
-});
-
 if (@ffiles) {
     print $LOG "DEBUG ffiles: ".Dumper(\@ffiles)."\n" if ($debug >= 1);
+
+    my $config = AppConfig->new({
+        # Auto Create variables mentioned in Conf file
+        CREATE => 1,
+        DEBUG => 0,
+        GLOBAL => {
+            # Each conf item is a hash
+            ARGCOUNT => AppConfig::ARGCOUNT_HASH
+        }
+    });
+
     $config->file(@ffiles);
     $ptr = $config->get("filter");
@@ -344 +346 @@
     $ptr = { };
 }
-return($ptr);
+%ptr = %$ptr;
+return(\%ptr);
 }
 
@@ -354 +357 @@
 my %filter=%$ptr;
 my $destfile=shift;
-my $pbpkg=shift;
-my $pbtag=shift;
 my $dtype=shift;
 my $dsuf=shift;
@@ -367 +368 @@
     foreach my $s (keys %filter) {
         # Process single variables
-        print $LOG "DEBUG filter{$s}: $filter{$s}\n" if ($debug > 1);
+        print $LOG "DEBUG filter{$s}: $filter{$s}\n" if ($debug >= 1);
         my $tmp = $filter{$s};
         next if (not defined $tmp);
         # Expand variables if any single one found
+        print $LOG "DEBUG tmp: $tmp\n" if ($debug >= 1);
         if ($tmp =~ /\$/) {
             eval { $tmp =~ s/(\$\w+)/$1/eeg };
@@ -376 +378 @@
         } elsif (($tmp =~ /^yes$/) && ($s =~ /^PBLOG$/) && ($line =~ /^PBLOG$/)) {
             $tmp = "";
-            my $p = $defpkgdir{$pbpkg};
-            $p = $extpkgdir{$pbpkg} if (not defined $p);
-            pb_changelog($dtype, $pbpkg, $pbtag, $dsuf, $p, \*DEST);
+            my $p = $defpkgdir{$ENV{'PBPKG'}};
+            $p = $extpkgdir{$ENV{'PBPKG'}} if (not defined $p);
+            pb_changelog($dtype, $ENV{'PBPKG'}, $ENV{'PBTAG'}, $dsuf, $p, \*DEST);
         }
         $line =~ s|$s|$tmp|;

devel/pbconf/project-builder/pbfilter/rpm.pbf

@@ -14 +14 @@
 
 # PBVER is replaced by the version ($pbver in code)
-filter PBVER = $pbver
+filter PBVER = $ENV{'PBVER'}
 
 # PBDATE is replaced by the date ($pbdate in code)
-filter PBDATE = $pbdate
+filter PBDATE = $ENV{'PBDATE'}
 
 # PBLOG is replaced by the changelog if value is yes
@@ -23 +23 @@
 
 # PBTAG is replaced by the tag ($pbtag in code)
-filter PBTAG = $pbtag
+filter PBTAG = $ENV{'PBTAG'}
 
 # PBREV is replaced by the revision ($pbrev in code)
-filter PBREV = $pbrev
+filter PBREV = $ENV{'PBREV'}
 
 # PBPKG is replaced by the package name ($pbpkg in code)
-filter PBPKG = $pbpkg
+filter PBPKG = $ENV{'PBPKG'}