Changeset 322 in ProjectBuilder

Timestamp:

Feb 19, 2008, 5:31:31 PM (17 years ago)

Author:

Bruno Cornec

Message:

Trying to solve the remaining issues for upstream projects with local CMS (begin)

Location:

devel/pb

Files:

• bin/pb (modified) (2 diffs)
• lib/ProjectBuilder/Base.pm (modified) (8 diffs)

devel/pb/bin/pb

@@ -511 +511 @@
     if ($cmt eq "vm") {
         $login = "vmlogin";
-        $dir = "pbdir";
+        $dir = "pbdefdir";
         $tmout = "vmtmout";
         $rebuild = "vmrebuild";
@@ -519 +519 @@
     } elsif ($cmt eq "ve") {
         $login = "velogin";
-        $dir = "pbdir";
+        $dir = "pbdefdir";
         $tmout = "vetmout";
         # Specific VE

devel/pb/lib/ProjectBuilder/Base.pm

@@ -58 +58 @@
 # and use its content
 #
-my ($pbconf) = pb_conf_read("$ENV{'PBETC'}","pbconf");
-pb_log(2,"DEBUG pbconf: ".Dumper($pbconf)."\n");
+my ($pbconf) = pb_conf_read("$ENV{'PBETC'}","pbconfurl");
+pb_log(2,"DEBUG pbconfurl: ".Dumper($pbconf)."\n");
 
 my %pbconf = %$pbconf;
@@ -67 +67 @@
     if (defined $proj) {
         pb_log(0,"WARNING: using $proj as default project as none has been specified\n");
-        pb_log(0,"         Please either create a pbconf reference for project $proj in $ENV{'PBETC'}\n");
+        pb_log(0,"         Please either create a pbconfurl reference for project $proj in $ENV{'PBETC'}\n");
         pb_log(0,"         or call pb with the -p project option or use the env var PBPROJ\n");
         pb_log(0,"         if you want to use another project\n");
     }
 }
-die "No project defined - use env var PBPROJ or -p proj or a pbconf entry in $ENV{'PBETC'}" if (not (defined $proj));
+die "No project defined - use env var PBPROJ or -p proj or a pbconfurl entry in $ENV{'PBETC'}" if (not (defined $proj));
 
 # That's always the environment variable that will be used
@@ -79 +79 @@
 
 if (not defined ($pbconf{$ENV{'PBPROJ'}})) {
-    die "Please create a pbconf reference for project $ENV{'PBPROJ'} in $ENV{'PBETC'}\n";
+    die "Please create a pbconfurl reference for project $ENV{'PBPROJ'} in $ENV{'PBETC'}\n";
 }
 
@@ -87 +87 @@
 # Tree will look like this:
 #
-#             maint pbdir                            PBDIR               dev dir (optional)   PBDEVDIR
+#             maint pbdefdir                         PBDEFDIR            dev dir (optional)   PBDEVDIR
 #                  |                                                        |
 #            ------------------------                                --------------------
@@ -94 +94 @@
 #            |                                                       |
 #  ---------------------------------------------                ----------
-#  *      *        |       |        |          |                *        *
+#  *      *        *       |        |          |                *        *
 # 1.0    dev    pbconf    ...     build     delivery PBCONF    dev      tag                   PBDEVROOT
 #                  |                           |     PBDESTDIR           |
@@ -114 +114 @@
 #
 #
-# (*) By default, if no relocation in .pbrc, dev dir is taken in the maint pbdir (when appropriate)
+# (*) By default, if no relocation in .pbrc, dev dir is taken in the maint pbdefdir (when appropriate)
 # Names under a pbproj and the corresponding pbconf should be similar
 #
 
-my ($pbdir) = pb_conf_get_if("pbdir");
-my %pbdir = %$pbdir;
-
-if (not defined $ENV{'PBDIR'}) {
-    if ((not defined $pbdir) || (not defined $pbdir{$ENV{'PBPROJ'}})) {
-        pb_log(0,"WARNING: no pbdir defined, using /var/cache\n");
-        pb_log(0,"         Please create a pbdir reference for project $ENV{'PBPROJ'} in $ENV{'PBETC'}\n");
+my ($pbdefdir) = pb_conf_get_if("pbdefdir");
+my %pbdefdir = %$pbdefdir;
+
+if (not defined $ENV{'PBDEFDIR'}) {
+    if ((not defined $pbdefdir) || (not defined $pbdefdir{$ENV{'PBPROJ'}})) {
+        pb_log(0,"WARNING: no pbdefdir defined, using /var/cache\n");
+        pb_log(0,"         Please create a pbdefdir reference for project $ENV{'PBPROJ'} in $ENV{'PBETC'}\n");
         pb_log(0,"         if you want to use another directory\n");
-        $ENV{'PBDIR'} = "/var/cache";
+        $ENV{'PBDEFDIR'} = "/var/cache";
     } else {
         # That's always the environment variable that will be used
-        $ENV{'PBDIR'} = $pbdir{$ENV{'PBPROJ'}};
+        $ENV{'PBDEFDIR'} = $pbdefdir{$ENV{'PBPROJ'}};
     }
 }
 # Expand potential env variable in it
-eval { $ENV{'PBDIR'} =~ s/(\$ENV.+\})/$1/eeg };
-
-pb_log(2,"PBDIR: $ENV{'PBDIR'}\n");
+eval { $ENV{'PBDEFDIR'} =~ s/(\$ENV.+\})/$1/eeg };
+
+pb_log(2,"PBDEFDIR: $ENV{'PBDEFDIR'}\n");
 #
 # Set delivery directory
 #
-$ENV{'PBDESTDIR'}="$ENV{'PBDIR'}/$ENV{'PBPROJ'}/delivery";
+$ENV{'PBDESTDIR'}="$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}/delivery";
 
 pb_log(2,"PBDESTDIR: $ENV{'PBDESTDIR'}\n");
@@ -165 +165 @@
 # Set build directory
 #
-$ENV{'PBBUILDDIR'}="$ENV{'PBDIR'}/$ENV{'PBPROJ'}/build";
+$ENV{'PBBUILDDIR'}="$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}/build";
 if (! -d "$ENV{'PBBUILDDIR'}") {
     pb_mkdir_p($ENV{'PBBUILDDIR'}) || die "Unable to recursively create $ENV{'PBBUILDDIR'}";
@@ -190 +190 @@
 # Check pbconf compliance
 #
-$ENV{'PBCONF'} = "$ENV{'PBDIR'}/$ENV{'PBPROJ'}/pbconf";
+my ($pbconfdir) = pb_conf_get_if("pbconfdir");
+my %pbconfdir = %$pbconfdir;
+
+if ((defined $pbconfdir) && (defined $pbconfdir{$ENV{'PBPROJ'}})) {
+    # That's always the environment variable that will be used
+    $ENV{'PBCONF'} = $pbconfdir{$ENV{'PBPROJ'}};
+} else {
+    pb_log(0,"WARNING: no pbconfdir defined, using $ENV{'PBDIR'}/$ENV{'PBPROJ'}/pbconf\n");
+    pb_log(0,"         Please create a pbconfdir reference for project $ENV{'PBPROJ'} in $ENV{'PBETC'}\n");
+    pb_log(0,"         if you want to use another directory\n");
+    $ENV{'PBCONF'} = "$ENV{'PBDIR'}/$ENV{'PBPROJ'}/pbconf";
+}
 pb_log(2,"PBCONF: $ENV{'PBCONF'}\n");