Changeset 174 in ProjectBuilder
- Timestamp:
- Oct 5, 2007, 9:15:03 PM (17 years ago)
- Location:
- devel
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb/bin/pb
r170 r174 146 146 147 147 my ($pkgv, $pkgt) = pb_conf_read("$ENV{'PBCONF'}/$ENV{'PBPROJ'}.pb","pkgver","pkgtag"); 148 149 # declare packager for filtering 150 my ($tmp) = pb_conf_get("packager"); 151 my $pbpackager = $tmp->{$ENV{'PBPROJ'}}; 152 148 153 foreach my $pbpkg (@pkgs) { 149 154 $ENV{'PBPKG'} = $pbpkg; … … 237 242 print $LOG "DEBUG bfiles: ".Dumper(\%bfiles)."\n" if ($debug >= 1); 238 243 239 # declare packager for filtering240 my ($pbpackager) = pb_conf_get("packager");241 244 # Get all filters to apply 242 245 my $ptr = pb_get_filters($pbpkg, $dtype, $dfam, $ddir, $dver); … … 246 249 if (defined $ptr) { 247 250 foreach my $f (values %bfiles) { 248 pb_filter_file_pb("$ENV{'PBROOT'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$pbsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$defpkgdir,$extpkgdir );251 pb_filter_file_pb("$ENV{'PBROOT'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$pbsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$defpkgdir,$extpkgdir, $pbpackager); 249 252 } 250 253 if (defined $filteredfiles->{$pbpkg}) { 251 254 foreach my $f (split(/,/,$filteredfiles->{$pbpkg})) { 252 pb_filter_file("$ENV{'PBROOT'}/$dir/$f",$ptr,"$dest/$f",$pbsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate );255 pb_filter_file("$ENV{'PBROOT'}/$dir/$f",$ptr,"$dest/$f",$pbsuf,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$pbpackager); 253 256 } 254 257 } … … 318 321 $pkg = { } if (not defined $pkg); 319 322 323 # declare packager 324 my ($tmp) = pb_conf_get("packager"); 325 my $pbpackager = $tmp->{$ENV{'PBPROJ'}}; 326 320 327 chdir "$ENV{'PBBUILDDIR'}"; 321 328 my $made = ""; # pkgs made during build … … 347 354 foreach my $f (@specfile) { 348 355 if ($f =~ /\.spec$/) { 349 pb_system("rpmbuild --define \" _topdir $ENV{'PBBUILDDIR'}\" -ba $f","Building package with $f under $ENV{'PBBUILDDIR'}");356 pb_system("rpmbuild --define \"packager $pbpackager\" --define \"_topdir $ENV{'PBBUILDDIR'}\" -ba $f","Building package with $f under $ENV{'PBBUILDDIR'}"); 350 357 last; 351 358 } -
devel/pb/lib/ProjectBuilder/Base.pm
r169 r174 439 439 my $defpkgdir = shift; 440 440 my $extpkgdir = shift; 441 my $pbpackager = shift; 441 442 442 443 # For the moment not dynamic … … 487 488 my $pbrev=shift; 488 489 my $pbdate=shift; 490 my $pbpackager=shift; 489 491 490 492 # For the moment not dynamic -
devel/pbconf/project-builder/pbfilter/rpm.pbf
r157 r174 33 33 # PBSUF is replaced by the package name ($pbpkg in code) 34 34 filter PBSUF = $pbsuf 35 36 # PBPACKAGER is replaced by the packager name ($pbpackager in code) 37 filter PBPACKAGER = $pbpackager
Note:
See TracChangeset
for help on using the changeset viewer.