Changeset 242 in ProjectBuilder for devel/pb

Timestamp:

Oct 22, 2007, 7:46:27 PM (18 years ago)

Author:

Bruno Cornec

Message:

Attempt to fix #2. Needs now to merge most of the .pbrc content into project build file configuration

File:

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

devel/pb/lib/ProjectBuilder/Base.pm

@@ -219 +219 @@
 }
 
-# Function which returns a pointer on a hash
-# corresponding to a declaration (arg2) in the main conf file
+# Function which returns a pointer on a table
+# corresponding to a set of values queried in the conf file
 # and test the returned vaue as they need to exist in that case
 sub pb_conf_get {
@@ -226 +226 @@
 my @param = @_;
 
-my @ptr = pb_conf_read("$ENV{'PBETC'}", @param);
+# Everything is returned via ptr1
+my @ptr1 = pb_conf_read("$ENV{'PBETC'}", @param);
+my @ptr2 = pb_conf_read("$ENV{'PBCONF'}/$ENV{'PBPROJ'}.pb", @param);
+
+my $p1;
+my $p2;
 
 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'}});
+    die "No $param[$i] defined for $ENV{'PBPROJ'}" if ((not defined $ptr1[$i]) && (not defined $ptr2[$i]));
+    # Always try to take the param from the home dir conf file in priority
+    # in order to mask what could be defined under the CMS to allow for overloading
+    $p1 = $ptr1[$i];
+    $p2 = $ptr2[$i];
+    if (not defined $p2) {
+        # No ref in CMS project conf file so use the home dir one.
+        $p1->{$ENV{'PBPROJ'}} = $p1->{'default'} if (not defined $p1->{$ENV{'PBPROJ'}});
+    } else {
+        # Ref found in CMS project conf file
+        if (not defined $p1) {
+            # No ref in home dir project conf file so use the CMS one.
+            $p2->{$ENV{'PBPROJ'}} = $p2->{'default'} if (not defined $p2->{$ENV{'PBPROJ'}});
+            $p1->{$ENV{'PBPROJ'}} = $p2->{$ENV{'PBPROJ'}};
+        } else {
+            # Both are defined - handling the overloading
+            if (not defined $p1->{'default'}) {
+                if (defined $p2->{'default'}) {
+                    $p1->{'default'} = $p2->{'default'};
+                }
+            }
+
+            if (not defined $p1->{$ENV{'PBPROJ'}}) {
+                if (defined $p2->{$ENV{'PBPROJ'}}) {
+                    $p1->{$ENV{'PBPROJ'}} = $p2->{$ENV{'PBPROJ'}};
+                } else {
+                    $p1->{$ENV{'PBPROJ'}} = $p1->{'default'};
+                }
+            }
+        }
+    }
+    die "No $param[$i] defined for $ENV{'PBPROJ'}" if (not defined $p1->{$ENV{'PBPROJ'}});
 }
 #print "DEBUG: param: ".Dumper(@ptr)."\n" if ($debug >= 1);
-return(@ptr);
+return(@ptr1);
+}
+
+sub pb_no_err {
 }
 
@@ -260 +296 @@
                             CREATE => 1,
                             DEBUG => $trace,
+                            ERROR => \&pb_no_err,
                             GLOBAL => {
                                 # Each conf item is a hash
@@ -280 +317 @@
 
 my ($cms) = pb_conf_get("cms");
-# This one is optional
-my ($cvsroot,$cvsrsh) = pb_conf_read($ENV{'PBETC'},"cvsroot","cvsrsh");
 
 if ($cms->{$proj} eq "svn") {
@@ -302 +337 @@
     # Export content if needed
     #
+    my ($cvsroot,$cvsrsh) = pb_conf_get("cvsroot","cvsrsh");
     $ENV{'CVSROOT'} = $cvsroot->{$proj} if (defined $cvsroot->{$proj});
     $ENV{'CVSRSH'} = $cvsrsh->{$proj} if (defined $cvsrsh->{$proj});