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

Timestamp:

Sep 15, 2008, 2:54:42 AM (16 years ago)

Author:

Bruno Cornec

Message:

First attempt to code support for real/virtual names for packages in order to support perl naming in both Debian and RPM distributions

File:

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

devel/pb/bin/pb

@@ -483 +483 @@
         pb_log(0,"Management of $pbpkg $pbver-$pbtag (rev $pbrev)\n");
         die "Unable to get env var PBDESTDIR" if (not defined $ENV{'PBDESTDIR'});
+
         # Clean up dest if necessary. The export will recreate it
         my $dest = "$ENV{'PBDESTDIR'}/$pbpkg-$pbver";
@@ -536 +537 @@
         }
 
-        # Setup %pb structure to allow filtering later on on files using that structure
+        # Setup %pb structure to allow filtering later on, on files using that structure
         $pb{'tag'} = $pbtag;
         $pb{'rev'} = $pbrev;
-        $pb{'pkg'} = $pbpkg;
         $pb{'ver'} = $pbver;
         $pb{'date'} = $pbdate;
@@ -558 +558 @@
             pb_log(2,"DEBUG: distro tuple: ".Dumper($ddir, $dver, $dfam, $pb{'dtype'}, $pb{'suf'})."\n");
             pb_log(2,"DEBUG Filtering PBDATE => $pbdate, PBTAG => $pbtag, PBVER => $pbver\n");
+
+            # We need to compute the real name of the package
+            my $pbpkgreal = pb_cms_get_real_pkg($pbpkg,$pb{'dtype'});
+            $pb{'pkg'} = $pbpkgreal;
 
             # Filter build files from the less precise up to the most with overloading
@@ -703 +707 @@
     pb_log(2,"DEBUG pkgs: ".Dumper(%pkgs)."\n");
     open(PKG,"> $ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb") || die "Unable to create $ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb";
-    foreach my $pbpkg (@pkgs) {
+    foreach my $pbpkg (keys %pkgs) {
         print PKG "pbpkg $pbpkg = $pkgs{$pbpkg}\n";
     }