Changeset 1584

Timestamp:

05/24/12 00:10:50 (12 months ago)

Author:

bruno

Message:

• Move PBPROJ env var setuo from Env.pm to Conf.pm to have it earlier available for some calls with less context.
• Fix a bug when (ve|vm|rm)path->ENV(PBPROJ) was undefined, and expand its path when defined to support that type of definition in conf files (pbtest does it)
• getconf now loads more conf files, and calls cms_compliant

Location:

devel/pb-modules/lib/ProjectBuilder

Files:

• Conf.pm (modified) (1 diff)
• Env.pm (modified) (4 diffs)

devel/pb-modules/lib/ProjectBuilder/Conf.pm

@@ -81 +81 @@
 
 pb_log(1,"Entering pb_conf_init\n");
+#
+# Check project name
+# Could be with env var PBPROJ
+# or option -p
+# if not defined take the first in conf file
+#
+if ((defined $ENV{'PBPROJ'}) &&
+    (not defined $proj)) {
+    pb_log(2,"PBPROJ env var setup ($ENV{'PBPROJ'}) so using it\n");
+    $proj = $ENV{'PBPROJ'};
+}
+
 if (defined $proj) {
     $ENV{'PBPROJ'} = $proj;

devel/pb-modules/lib/ProjectBuilder/Env.pm

@@ -151 +151 @@
 
 #
-# Check project name
-# Could be with env var PBPROJ
-# or option -p
-# if not defined take the first in conf file
-#
-if ((defined $ENV{'PBPROJ'}) &&
-    (not (defined $proj))) {
-    $proj = $ENV{'PBPROJ'};
-}
-
-#
 # We get the pbconf file for that project 
 # and use its content
@@ -192 +181 @@
 # important than the project conf file
 my ($vmpath,$vepath,$rmpath) = pb_conf_get_if("vmpath","vepath","rmpath");
-pb_conf_add("$vmpath->{$ENV{'PBPROJ'}}/.pbrc") if ((defined $vmpath) && (-f "$vmpath->{$ENV{'PBPROJ'}}/.pbrc"));
-pb_conf_add("$vepath->{$ENV{'PBPROJ'}}/.pbrc") if ((defined $vepath) && (-f "$vepath->{$ENV{'PBPROJ'}}/.pbrc"));
-pb_conf_add("$rmpath->{$ENV{'PBPROJ'}}/.pbrc") if ((defined $rmpath) && (-f "$rmpath->{$ENV{'PBPROJ'}}/.pbrc"));
+foreach my $p ($vmpath,$vepath,$rmpath) {
+    if ((defined $p) && (defined $p->{$ENV{'PBPROJ'}})) {
+        $p->{$ENV{'PBPROJ'}} = pb_path_expand($p->{$ENV{'PBPROJ'}});
+        pb_conf_add("$p->{$ENV{'PBPROJ'}}/.pbrc") if (-f "$p->{$ENV{'PBPROJ'}}/.pbrc");
+    }
+}
 
 #
@@ -312 +304 @@
 #
 
-if (($action =~ /^cms2/) || ($action =~ /^sbx2/) || ($action =~ /^newver$/) || ($action =~ /pbinit/) || ($action =~ /^newproj$/) || ($action =~ /^announce/) || ($action =~ /^checkssh/) || ($action =~ /^cleanssh/)) {
+if ($action =~ /^(cms2|sbx2|newver|pbinit|newproj|announce|checkssh|cleanssh|getconf)/) {
 
     #
@@ -344 +336 @@
     pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb") if (-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb");
 
-    return if ($action =~ /^newver$/);
+    return if ($action =~ /^(newver|getconf)$/);
 
     my %version = ();