Changeset 66 in ProjectBuilder for 0.5/pb/lib/ProjectBuilder/common.pm

Timestamp:

Aug 31, 2007, 1:19:46 PM (17 years ago)

Author:

Bruno Cornec

Message:

Add the -r option to support multiple version in parallel

File:

• 0.5/pb/lib/ProjectBuilder/common.pm (modified) (1 diff)

0.5/pb/lib/ProjectBuilder/common.pm

@@ -33 +33 @@
 }
 #
-# Use project configuration file
+# Use project configuration file if needed
 #
-pb_init("$ENV{'PBETC'}");
+if (not defined $ENV{'PBROOT'}) {
+    pb_init("$ENV{'PBETC'}");
 
-if (not defined $proj) {
-    # Take the first as the default project
-    $proj = (keys %pbroot)[0];
+    if (not defined $proj) {
+        # Take the first as the default project
+        $proj = (keys %pbroot)[0];
     print $LOG "Using $proj as default project as none has been specified\n" if (($debug >= 0) and (defined $proj));
+    }
+    die "No project defined - use env var PBPROJ or -p proj" if (not (defined $proj));
+
+    $ENV{'PBROOT'} = $pbroot{$proj}; 
+} else {
+    die "No project defined - use env var PBPROJ or -p proj" if (not (defined $proj));
 }
-die "No project defined - use env var PBPROJ or -p proj" if (not (defined $proj));
-
-$ENV{'PBROOT'} = $pbroot{$proj}; 
 
 #