Changeset 19 in ProjectBuilder
Legend:
- Unmodified
- Added
- Removed
-
devel/pb/bin/pb.pl
r18 r19 22 22 23 23 use vars qw (%defpkgdir %extpkgdir %version %confparam %filteredfiles); 24 %extpkgdir = (); 25 %filteredfiles = (); 24 26 use lib qw (lib); 25 27 use common qw (env_init); … … 218 220 } 219 221 }); 220 print "ffiles: ".Dumper(\@ffiles)."\n";222 my $ptr; 221 223 if (@ffiles) { 224 print "ffiles: ".Dumper(\@ffiles)."\n"; 222 225 $config->file(@ffiles); 223 my$ptr = $config->get("filter");226 $ptr = $config->get("filter"); 224 227 print "f:".Dumper($ptr)."\n"; 225 226 # Apply now all the filters on all the files concerned 227 # All files are relative to PBROOT 228 # destination dir depends on the type of file 229 if (defined $ptr) { 230 foreach my $f (values %bfiles) { 231 filter_file($f,$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$pkg,$dtype,$dsuf); 232 } 233 foreach my $f (keys %filteredfiles) { 234 filter_file($f,$ptr,"$dest/$f",$pkg,$dtype,$dsuf); 235 } 228 } else { 229 $ptr = { }; 230 } 231 232 # Apply now all the filters on all the files concerned 233 # All files are relative to PBROOT 234 # destination dir depends on the type of file 235 if (defined $ptr) { 236 foreach my $f (values %bfiles) { 237 filter_file($f,$ptr,"$dest/pbconf/$ddir-$dver/".basename($f),$pkg,$dtype,$dsuf); 238 } 239 foreach my $f (keys %filteredfiles) { 240 filter_file($f,$ptr,"$dest/$f",$pkg,$dtype,$dsuf); 236 241 } 237 242 } -
devel/pb/lib/pb.pm
r18 r19 8 8 use strict; 9 9 use AppConfig qw(ARGCOUNT_HASH); 10 use Data::Dumper; 10 11 11 12 sub pb_init { … … 17 18 # Auto Create variables mentioned in Conf file 18 19 CREATE => 1, 19 DEBUG => 0,20 DEBUG => 1, 20 21 GLOBAL => { 21 22 # Each conf item is a hash 22 ARGCOUNT => AppConfig::ARGCOUNT_HASH 23 DEFAULT => { }, 24 ARGCOUNT => AppConfig::ARGCOUNT_HASH, 23 25 } 24 26 }); … … 32 34 $ptr = $config->get("confparam") || die "Unable to find confparam in $conffile"; 33 35 %confparam = %$ptr; 36 print "confparam: ".Dumper($ptr)."\n"; 34 37 35 38 # List of pkg to build by default (mandatory) 36 39 $ptr = $config->get("defpkgdir") || die "Unable to find defpkgdir in $conffile"; 37 40 %defpkgdir = %$ptr; 41 print "defpkgdir: ".Dumper($ptr)."\n"; 38 42 39 43 # List of additional pkg to build when all is called (optional) 40 44 $ptr = $config->get("extpkgdir"); 45 print "extpkgdir1: ".Dumper($ptr)."\n"; 41 46 if (not defined $ptr) { 42 47 %extpkgdir = (); … … 44 49 %extpkgdir = %$ptr; 45 50 } 51 print "extpkgdir: ".Dumper(\%extpkgdir)."\n"; 46 52 47 53 # Valid version names (optional) … … 52 58 %version = %$ptr; 53 59 } 60 print "version: ".Dumper(\%version)."\n"; 54 61 55 62 # List of files to filter (optional) … … 60 67 %filteredfiles = %$ptr; 61 68 } 69 print "filteredfiles: ".Dumper(\%filteredfiles)."\n"; 62 70 63 71 }
Note:
See TracChangeset
for help on using the changeset viewer.