Changeset 87 in ProjectBuilder for devel/pb/lib/ProjectBuilder

Timestamp:

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

Author:

Bruno Cornec

Message:

confparam is gone. params are stored in .pbrc instead

Location:

devel/pb/lib/ProjectBuilder

Files:

• Base.pm (modified) (4 diffs)
• Changelog.pm (modified) (3 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";

devel/pb/lib/ProjectBuilder/Changelog.pm

@@ -66 +66 @@
     my $n2date = &UnixDate($date,"%a, %d %b %Y %H:%M:%S %z");
     #print "**$ndate**\n";
-    my $confparam = pb_conf_read("$ENV{'PBCONF'}/$ENV{'PBPROJ'}.pb", "confparam");
-    my %confparam = %$confparam;
+    my $packager = pb_conf_read("$ENV{'PBETC'}", "packager");
+    my %packager = %$packager;
     if (($dtype eq "rpm") || ($dtype eq "fc")) {
         if ($ver !~ /-/) {
@@ -79 +79 @@
             $ver2 = "$ver$dsuf";
         }
-        print $OUTPUT "* $ndate $confparam{'packager'} $ver2\n";
+        print $OUTPUT "* $ndate $packager{$ENV{'PBPROJ'}} $ver2\n";
         print $OUTPUT "- Updated to $ver\n";
         }
@@ -102 +102 @@
 
     if ($dtype eq "deb") {
-        print $OUTPUT " -- $confparam{'packager'} $n2date\n\n";
+        print $OUTPUT " -- $packager{$ENV{'PBPROJ'}} $n2date\n\n";
         print $OUTPUT "\n";
         }