Changeset 300 in ProjectBuilder for devel/pb/bin/pb
- Timestamp:
- Jan 27, 2008, 9:22:16 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb/bin/pb
r298 r300 99 99 die pb_syntax() if (not defined $action); 100 100 101 my ($pbrc, $filteredfiles, $ defpkgdir, $extpkgdir);101 my ($pbrc, $filteredfiles, $supfiles, $defpkgdir, $extpkgdir); 102 102 my $pbinit = undef; 103 103 $pbinit = 1 if ($action =~ /^newproj$/); … … 106 106 # And get global params 107 107 if (defined $opts{'p'}) { 108 ($ENV{'PBPROJ'},$debug,$LOG, $pbrc, $filteredfiles, $ defpkgdir, $extpkgdir)108 ($ENV{'PBPROJ'},$debug,$LOG, $pbrc, $filteredfiles, $supfiles, $defpkgdir, $extpkgdir) 109 109 = pb_env_init($opts{'p'},$pbinit); 110 110 } else { 111 ($ENV{'PBPROJ'},$debug,$LOG, $pbrc, $filteredfiles, $ defpkgdir, $extpkgdir)111 ($ENV{'PBPROJ'},$debug,$LOG, $pbrc, $filteredfiles, $supfiles, $defpkgdir, $extpkgdir) 112 112 = pb_env_init(undef,$pbinit); 113 113 } … … 233 233 234 234 # Find all build files first relatively to PBROOT 235 # Find also all specific files referenced in the .pb conf file 235 236 my %bfiles; 237 my %pkgfiles; 236 238 print $LOG "DEBUG dir: $ENV{'PBCONF'}/$pbpkg\n" if ($debug >= 1); 237 239 $build{"$ddir-$dver"} = "yes"; … … 242 244 $bfiles{$f} = "$ENV{'PBCONF'}/$pbpkg/$dtype/$f"; 243 245 $bfiles{$f} =~ s~$ENV{'PBROOT'}~~; 246 if (defined $supfiles->{$pbpkg}) { 247 $pkgfiles{$f} = "$ENV{'PBCONF'}/$pbpkg/$dtype/$f" if ($f =~ /$supfiles->{$pbpkg}/); 248 } 244 249 } 245 250 closedir(BDIR); … … 250 255 $bfiles{$f} = "$ENV{'PBCONF'}/$pbpkg/$dfam/$f"; 251 256 $bfiles{$f} =~ s~$ENV{'PBROOT'}~~; 257 if (defined $supfiles->{$pbpkg}) { 258 $pkgfiles{$f} = "$ENV{'PBCONF'}/$pbpkg/$dfam/$f" if ($f =~ /$supfiles->{$pbpkg}/); 259 } 252 260 } 253 261 closedir(BDIR); … … 258 266 $bfiles{$f} = "$ENV{'PBCONF'}/$pbpkg/$ddir/$f"; 259 267 $bfiles{$f} =~ s~$ENV{'PBROOT'}~~; 268 if (defined $supfiles->{$pbpkg}) { 269 $pkgfiles{$f} = "$ENV{'PBCONF'}/$pbpkg/$ddir/$f" if ($f =~ /$supfiles->{$pbpkg}/); 270 } 260 271 } 261 272 closedir(BDIR); … … 266 277 $bfiles{$f} = "$ENV{'PBCONF'}/$pbpkg/$ddir-$dver/$f"; 267 278 $bfiles{$f} =~ s~$ENV{'PBROOT'}~~; 279 if (defined $supfiles->{$pbpkg}) { 280 $pkgfiles{$f} = "$ENV{'PBCONF'}/$pbpkg/$ddir-$dver/$f" if ($f =~ /$supfiles->{$pbpkg}/); 281 } 268 282 } 269 283 closedir(BDIR); … … 280 294 # destination dir depends on the type of file 281 295 if (defined $ptr) { 282 foreach my $f (values %bfiles ) {296 foreach my $f (values %bfiles,values %pkgfiles) { 283 297 pb_filter_file_pb("$ENV{'PBROOT'}/$f",$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$dtype,$pbsuf,$ENV{'PBPROJ'},$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$defpkgdir,$extpkgdir,$pbpackager,$chglog); 284 298 }
Note:
See TracChangeset
for help on using the changeset viewer.