Changeset 87 in ProjectBuilder for devel/pb/lib/ProjectBuilder/Base.pm
- Timestamp:
- Sep 3, 2007, 2:46:15 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb/lib/ProjectBuilder/Base.pm
r82 r87 76 76 77 77 my %version = (); 78 my %confparam = ();79 78 80 79 if (-f "$ENV{'PBCONF'}/$proj.pb") { 81 # main parameter confparam (mandatory)82 80 # List of pkg to build by default (mandatory) 83 81 # List of additional pkg to build when all is called (optional) 84 82 # Valid version names (optional) 85 83 # List of files to filter (optional) 86 my $ptr = pb_conf_read("$ENV{'PBCONF'}/$proj.pb","confparam","defpkgdir","extpkgdir","version","filteredfiles"); 87 my ($confparam, $defpkgdir, $extpkgdir, $version, $filteredfiles) = @$ptr; 88 print "DEBUG: confparam: ".Dumper($confparam)."\n" if ($debug >= 1); 84 my $ptr = pb_conf_read("$ENV{'PBCONF'}/$proj.pb","defpkgdir","extpkgdir","version","filteredfiles"); 85 my ($defpkgdir, $extpkgdir, $version, $filteredfiles) = @$ptr; 89 86 print "DEBUG: defpkgdir: ".Dumper($defpkgdir)."\n" if ($debug >= 1); 90 87 print "DEBUG: extpkgdir: ".Dumper($extpkgdir)."\n" if ($debug >= 1); 91 88 print "DEBUG: version: ".Dumper($version)."\n" if ($debug >= 1); 92 89 print "DEBUG: filteredfiles: ".Dumper($filteredfiles)."\n" if ($debug >= 1); 93 die "Unable to find confparam in $ENV{'PBCONF'}/$proj.pb" if (not defined $confparam);94 90 die "Unable to find defpkgdir in $ENV{'PBCONF'}/$proj.pb" if (not defined $defpkgdir); 95 %confparam = %$confparam;96 91 # Global 97 92 %defpkgdir = %$defpkgdir; … … 106 101 } else { 107 102 die "Unable to open $ENV{'PBCONF'}/$proj.pb"; 108 }109 110 #111 # Export content if needed112 #113 if (defined $confparam{"cvsroot"}) {114 $ENV{'CVSROOT'} = $confparam{"cvsroot"};115 103 } 116 104 … … 278 266 my $ret; 279 267 280 my $cms = pb_conf_read("$ENV{'PBETC'}","cms");268 my ($cms,$cvsroot) = pb_conf_read("$ENV{'PBETC'}","cms","cvsroot"); 281 269 die "No CMS defined for $proj" if (not defined $cms); 282 270 my %cms = %$cms; … … 295 283 $ENV{'PBCMSLOGFILE'}="cvs.log"; 296 284 $ENV{'PBCMSEXP'}="cvs export" 285 # 286 # Export content if needed 287 # 288 $ENV{'CVSROOT'} = $cvsroot{$proj} if (defined $cvsroot{$proj}); 297 289 } else { 298 290 die "CMS $cms{$proj} unknown";
Note:
See TracChangeset
for help on using the changeset viewer.