Changeset 87 in ProjectBuilder for devel/pb/lib/ProjectBuilder/Base.pm

Timestamp:

Sep 3, 2007, 2:46:15 PM (17 years ago)

Author:

Bruno Cornec

Message:

confparam is gone. params are stored in .pbrc instead

File:

• devel/pb/lib/ProjectBuilder/Base.pm (modified) (4 diffs)

devel/pb/lib/ProjectBuilder/Base.pm

@@ -76 +76 @@
 
 my %version = ();
-my %confparam = ();
 
 if (-f "$ENV{'PBCONF'}/$proj.pb") {
-    # main parameter confparam (mandatory)
     # List of pkg to build by default (mandatory)
     # List of additional pkg to build when all is called (optional)
     # Valid version names (optional)
     # List of files to filter (optional)
-    my $ptr = pb_conf_read("$ENV{'PBCONF'}/$proj.pb","confparam","defpkgdir","extpkgdir","version","filteredfiles");
-    my ($confparam, $defpkgdir, $extpkgdir, $version, $filteredfiles) = @$ptr;
-    print "DEBUG: confparam: ".Dumper($confparam)."\n" if ($debug >= 1);
+    my $ptr = pb_conf_read("$ENV{'PBCONF'}/$proj.pb","defpkgdir","extpkgdir","version","filteredfiles");
+    my ($defpkgdir, $extpkgdir, $version, $filteredfiles) = @$ptr;
     print "DEBUG: defpkgdir: ".Dumper($defpkgdir)."\n" if ($debug >= 1);
     print "DEBUG: extpkgdir: ".Dumper($extpkgdir)."\n" if ($debug >= 1);
     print "DEBUG: version: ".Dumper($version)."\n" if ($debug >= 1);
     print "DEBUG: filteredfiles: ".Dumper($filteredfiles)."\n" if ($debug >= 1);
-    die "Unable to find confparam in $ENV{'PBCONF'}/$proj.pb" if (not defined $confparam);
     die "Unable to find defpkgdir in $ENV{'PBCONF'}/$proj.pb" if (not defined $defpkgdir);
-    %confparam = %$confparam;
     # Global
     %defpkgdir = %$defpkgdir;
@@ -106 +101 @@
 } else {
     die "Unable to open $ENV{'PBCONF'}/$proj.pb";
-}
-
-#
-# Export content if needed
-#
-if (defined $confparam{"cvsroot"}) {
-    $ENV{'CVSROOT'} = $confparam{"cvsroot"}; 
 }
 
@@ -278 +266 @@
 my $ret;
 
-my $cms = pb_conf_read("$ENV{'PBETC'}","cms");
+my ($cms,$cvsroot) = pb_conf_read("$ENV{'PBETC'}","cms","cvsroot");
 die "No CMS defined for $proj" if (not defined $cms);
 my %cms = %$cms;
@@ -295 +283 @@
     $ENV{'PBCMSLOGFILE'}="cvs.log";
     $ENV{'PBCMSEXP'}="cvs export"
+    #
+    # Export content if needed
+    #
+    $ENV{'CVSROOT'} = $cvsroot{$proj} if (defined $cvsroot{$proj});
 } else {
     die "CMS $cms{$proj} unknown";