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

Timestamp:

Sep 3, 2007, 4:36:22 PM (17 years ago)

Author:

Bruno Cornec

Message:

Prepare for new actions on delivery on SSH

Location:

devel/pb/lib/ProjectBuilder

Files:

• Base.pm (modified) (4 diffs)
• Changelog.pm (modified) (4 diffs)

devel/pb/lib/ProjectBuilder/Base.pm

@@ -193 +193 @@
 
 # Function which returns a pointer on a hash
+# corresponding to a declaration (arg2) in the main conf file
+# and test the returned vaue as they need to exist in that case
+sub pb_conf_get {
+
+my @param = @_;
+
+my $ptr = pb_conf_read("$ENV{'PBETC'}", @param);
+my @ptr;
+if ($#param == 0) {
+    push @ptr, $ptr;
+} else {
+    @ptr = @$ptr;
+}
+foreach my $i (0..$#param) {
+    die "No $param[$i] defined for $ENV{'PBPROJ'}" if (not defined $ptr[$i]);
+    my $p = $ptr[$i];
+    $p->{$ENV{'PBPROJ'}} = $p->{'default'} if (not defined $p->{$ENV{'PBPROJ'}});
+    die "No $param[$i] defined for $ENV{'PBPROJ'}" if (not defined $p->{$ENV{'PBPROJ'}});
+}
+if ($#param == 0) {
+    print "DEBUG: param: ".Dumper($ptr[0])."\n" if ($debug >= 1);
+    return($ptr[0]);
+} else {
+    my $ptr = \@ptr;
+    print "DEBUG: param: ".Dumper($ptr)."\n" if ($debug >= 1);
+    return($ptr);
+}
+}
+
+# Function which returns a pointer on a hash
 # corresponding to a declaration (arg2) in a conf file (arg1)
 sub pb_conf_read {
@@ -222 +252 @@
 }
 if ($#param == 0) {
-    print "DEBUG: param: ".Dumper($ptr[0])."\n" if ($debug >= 1);
+    print "DEBUG: param: $param[0] ".Dumper($ptr[0])."\n" if ($debug >= 1);
     return($ptr[0]);
 } else {
     my $ptr = \@ptr;
-    print "DEBUG: params: ".Dumper($ptr)."\n" if ($debug >= 1);
+    print "DEBUG: params: ".Dumper(@param)." ".Dumper($ptr)."\n" if ($debug >= 1);
     return($ptr);
 }
-}
-
-sub pb_conf_init {
-
-my $conffile = shift;
-my $ptr;
-my $trace;
-
-if ($debug > 0) {
-    $trace = 1;
-} else {
-    $trace = 0;
-}
-
-my $config = AppConfig->new({
-                            # Auto Create variables mentioned in Conf file
-                            DEBUG => $trace,
-                            CREATE => '1',
-                            GLOBAL => {
-                                # Each conf item is a hash
-                                ARGCOUNT => ARGCOUNT_HASH,
-                            },
-                        });
-$config->file($conffile);
-
-# Root of the project to build
-# needs at least 2 levels of dir as in the upper 
-# other dirs will be created and used 
-
 }
 
@@ -266 +267 @@
 my $ret;
 
-my ($cms,$cvsroot) = pb_conf_read("$ENV{'PBETC'}","cms","cvsroot");
-die "No CMS defined for $proj" if (not defined $cms);
-my %cms = %$cms;
-die "No CMS defined for $proj" if (not defined $cms{$proj});
-
-if ($cms{$proj} eq "svn") {
+my $cms = pb_conf_get("cms");
+# This one is optional
+my $cvsroot = pb_conf_read($ENV{'PBETC'},"cvsroot");
+
+if ($cms->{$proj} eq "svn") {
     $ENV{'PBREVISION'}=`(cd "$ENV{'PBROOT'}" ; svnversion .)`;
     chomp($ENV{'PBREVISION'});
@@ -277 +277 @@
     $ENV{'PBCMSLOGFILE'}="svn.log";
     $ENV{'PBCMSEXP'}="svn export";
-} elsif ($cms{$proj} eq "cvs") {
+} elsif ($cms->{$proj} eq "cvs") {
     $ENV{'PBREVISION'}=`(cd "$ENV{'PBROOT'}" ; cvs rannotate  -f . 2>&1 | awk '{print \$1}' | grep -E '^[0-9]' | cut -d. -f2 |sort -nu | tail -1)`;
     chomp($ENV{'PBREVISION'});
     $ENV{'PBCMSLOG'}="cvs log";
     $ENV{'PBCMSLOGFILE'}="cvs.log";
-    $ENV{'PBCMSEXP'}="cvs export"
+    $ENV{'PBCMSEXP'}="cvs export";
     #
     # Export content if needed
     #
-    $ENV{'CVSROOT'} = $cvsroot{$proj} if (defined $cvsroot{$proj});
-} else {
-    die "CMS $cms{$proj} unknown";
+    $ENV{'CVSROOT'} = $cvsroot->{$proj} if (defined $cvsroot->{$proj});
+} else {
+    die "cms $cms->{$proj} unknown";
 }
 }

devel/pb/lib/ProjectBuilder/Changelog.pm

@@ -10 +10 @@
 use File::Basename;
 use English;
-use ProjectBuilder::Base qw (pb_conf_read);
+use ProjectBuilder::Base qw (pb_conf_read _conf_get);
 
 sub pb_changelog {
@@ -66 +66 @@
     my $n2date = &UnixDate($date,"%a, %d %b %Y %H:%M:%S %z");
     #print "**$ndate**\n";
-    my $packager = pb_conf_read("$ENV{'PBETC'}", "packager");
-    my %packager = %$packager;
+    my $packager = pb_conf_get("packager");
+
     if (($dtype eq "rpm") || ($dtype eq "fc")) {
         if ($ver !~ /-/) {
@@ -79 +79 @@
             $ver2 = "$ver$dsuf";
         }
-        print $OUTPUT "* $ndate $packager{$ENV{'PBPROJ'}} $ver2\n";
+        print $OUTPUT "* $ndate $packager->{$ENV{'PBPROJ'}} $ver2\n";
         print $OUTPUT "- Updated to $ver\n";
         }
@@ -102 +102 @@
 
     if ($dtype eq "deb") {
-        print $OUTPUT " -- $packager{$ENV{'PBPROJ'}} $n2date\n\n";
+        print $OUTPUT " -- $packager->{$ENV{'PBPROJ'}} $n2date\n\n";
         print $OUTPUT "\n";
         }