Changeset 89 in ProjectBuilder for devel/pb/lib/ProjectBuilder/Base.pm
- Timestamp:
- Sep 3, 2007, 4:47:47 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb/lib/ProjectBuilder/Base.pm
r88 r89 37 37 # and use its content 38 38 # 39 my $pbrc= pb_conf_read("$ENV{'PBETC'}","pbrc");39 my ($pbrc) = pb_conf_read("$ENV{'PBETC'}","pbrc"); 40 40 print "DEBUG pbrc: ".Dumper($pbrc)."\n" if ($debug >= 1); 41 41 … … 60 60 if (not defined $ENV{'PBROOT'}) { 61 61 if (-f $pbrc{$proj}) { 62 my $pbroot= pb_conf_read($pbrc{$proj},"pbroot");62 my ($pbroot) = pb_conf_read($pbrc{$proj},"pbroot"); 63 63 my %pbroot = %$pbroot; 64 64 # All lines should point to the same pbroot so take the first … … 82 82 # Valid version names (optional) 83 83 # List of files to filter (optional) 84 my $ptr = pb_conf_read("$ENV{'PBCONF'}/$proj.pb","defpkgdir","extpkgdir","version","filteredfiles"); 85 my ($defpkgdir, $extpkgdir, $version, $filteredfiles) = @$ptr; 84 my ($defpkgdir, $extpkgdir, $version, $filteredfiles) = pb_conf_read("$ENV{'PBCONF'}/$proj.pb","defpkgdir","extpkgdir","version","filteredfiles"); 86 85 print "DEBUG: defpkgdir: ".Dumper($defpkgdir)."\n" if ($debug >= 1); 87 86 print "DEBUG: extpkgdir: ".Dumper($extpkgdir)."\n" if ($debug >= 1); … … 199 198 my @param = @_; 200 199 201 my $ptr = pb_conf_read("$ENV{'PBETC'}", @param); 202 my @ptr; 203 if ($#param == 0) { 204 push @ptr, $ptr; 205 } else { 206 @ptr = @$ptr; 207 } 200 my @ptr = pb_conf_read("$ENV{'PBETC'}", @param); 201 208 202 foreach my $i (0..$#param) { 209 203 die "No $param[$i] defined for $ENV{'PBPROJ'}" if (not defined $ptr[$i]); … … 212 206 die "No $param[$i] defined for $ENV{'PBPROJ'}" if (not defined $p->{$ENV{'PBPROJ'}}); 213 207 } 214 if ($#param == 0) { 215 print "DEBUG: param: ".Dumper($ptr[0])."\n" if ($debug >= 1); 216 return($ptr[0]); 217 } else { 218 my $ptr = \@ptr; 219 print "DEBUG: param: ".Dumper($ptr)."\n" if ($debug >= 1); 220 return($ptr); 221 } 208 print "DEBUG: param: ".Dumper($ptr)."\n" if ($debug >= 1); 209 return(@ptr); 222 210 } 223 211 … … 251 239 push @ptr,$config->get($param); 252 240 } 253 if ($#param == 0) { 254 print "DEBUG: param: $param[0] ".Dumper($ptr[0])."\n" if ($debug >= 1); 255 return($ptr[0]); 256 } else { 257 my $ptr = \@ptr; 258 print "DEBUG: params: ".Dumper(@param)." ".Dumper($ptr)."\n" if ($debug >= 1); 259 return($ptr); 260 } 241 print "DEBUG: params: ".Dumper(@param)." ".Dumper(@ptr)."\n" if ($debug >= 1); 242 return(@ptr); 261 243 } 262 244 … … 267 249 my $ret; 268 250 269 my $cms= pb_conf_get("cms");251 my ($cms) = pb_conf_get("cms"); 270 252 # This one is optional 271 my $cvsroot= pb_conf_read($ENV{'PBETC'},"cvsroot");253 my ($cvsroot) = pb_conf_read($ENV{'PBETC'},"cvsroot"); 272 254 273 255 if ($cms->{$proj} eq "svn") {
Note:
See TracChangeset
for help on using the changeset viewer.