Changeset 174

Timestamp:

10/05/07 21:15:03 (6 years ago)

Author:

bruno

Message:

Handles pbpackager correctly, and especially in rpm build with a define

Location:

devel

Files:

• pb/bin/pb (modified) (5 diffs)
• pb/lib/ProjectBuilder/Base.pm (modified) (2 diffs)
• pbconf/project-builder/pbfilter/rpm.pbf (modified) (1 diff)

devel/pb/bin/pb

@@ -146 +146 @@
 
     my ($pkgv, $pkgt) = pb_conf_read("$ENV{'PBCONF'}/$ENV{'PBPROJ'}.pb","pkgver","pkgtag");
+
+    # declare packager for filtering
+    my ($tmp) = pb_conf_get("packager");
+    my $pbpackager = $tmp->{$ENV{'PBPROJ'}};
+
     foreach my $pbpkg (@pkgs) {
         $ENV{'PBPKG'} = $pbpkg;
@@ -237 +242 @@
             print $LOG "DEBUG bfiles: ".Dumper(\%bfiles)."\n" if ($debug >= 1);
 
-            # declare packager for filtering
-            my ($pbpackager) = pb_conf_get("packager");
             # Get all filters to apply
             my $ptr = pb_get_filters($pbpkg, $dtype, $dfam, $ddir, $dver);
@@ -246 +249 @@
             if (defined $ptr) {
                 foreach my $f (values %bfiles) {
-                    pb_filter_file_pb("$ENV{'PBROOT'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$pbsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$defpkgdir,$extpkgdir);
+                    pb_filter_file_pb("$ENV{'PBROOT'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$pbsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$defpkgdir,$extpkgdir, $pbpackager);
                 }
                 if (defined $filteredfiles->{$pbpkg}) {
                     foreach my $f (split(/,/,$filteredfiles->{$pbpkg})) {
-                        pb_filter_file("$ENV{'PBROOT'}/$dir/$f",$ptr,"$dest/$f",$pbsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate);
+                        pb_filter_file("$ENV{'PBROOT'}/$dir/$f",$ptr,"$dest/$f",$pbsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$pbpackager);
                     }
                 }
@@ -318 +321 @@
     $pkg = { } if (not defined $pkg);
 
+    # declare packager
+    my ($tmp) = pb_conf_get("packager");
+    my $pbpackager = $tmp->{$ENV{'PBPROJ'}};
+
     chdir "$ENV{'PBBUILDDIR'}";
     my $made = ""; # pkgs made during build
@@ -347 +354 @@
             foreach my $f (@specfile) {
                 if ($f =~ /\.spec$/) {
-                    pb_system("rpmbuild --define \"_topdir $ENV{'PBBUILDDIR'}\" -ba $f","Building package with $f under $ENV{'PBBUILDDIR'}");
+                    pb_system("rpmbuild --define \"packager $pbpackager\" --define \"_topdir $ENV{'PBBUILDDIR'}\" -ba $f","Building package with $f under $ENV{'PBBUILDDIR'}");
                     last;
                 }

devel/pb/lib/ProjectBuilder/Base.pm

@@ -439 +439 @@
 my $defpkgdir = shift;
 my $extpkgdir = shift;
+my $pbpackager = shift;
 
 # For the moment not dynamic
@@ -487 +488 @@
 my $pbrev=shift;
 my $pbdate=shift;
+my $pbpackager=shift;
 
 # For the moment not dynamic

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

@@ -33 +33 @@
 # PBSUF is replaced by the package name ($pbpkg in code)
 filter PBSUF = $pbsuf
+
+# PBPACKAGER is replaced by the packager name ($pbpackager in code)
+filter PBPACKAGER = $pbpackager