Changeset 323 in ProjectBuilder for devel/pb/lib/ProjectBuilder/Base.pm

Timestamp:

Feb 20, 2008, 11:02:16 AM (16 years ago)

Author:

Bruno Cornec

Message:

Small fixes for CMS support

File:

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

devel/pb/lib/ProjectBuilder/Base.pm

@@ -95 +95 @@
 #  ---------------------------------------------                ----------
 #  *      *        *       |        |          |                *        *
-# 1.0    dev    pbconf    ...     build     delivery PBCONF    dev      tag                   PBDEVROOT
-#                  |                           |     PBDESTDIR           |
-#               ------                        pbrc   PBBUILDDIR       -------
-#               |    |                                                |     |
-#              dev  tag                              PBROOT          1.0   1.1
+# tag    dev    pbconf    ...     build     delivery PBCONF    dev      tag                   PBDEVROOT
+#  |               |                           |     PBDESTDIR           |
+#  ---          ------                        pbrc   PBBUILDDIR       -------
+#    |          |    |                                                |     |
+#   1.1        dev  tag                              PBROOT          1.0   1.1
 #                    |
 #                 -------
@@ -190 +190 @@
 # Check pbconf compliance
 #
+
 my ($pbconfdir) = pb_conf_get_if("pbconfdir");
 my %pbconfdir = %$pbconfdir;
@@ -197 +198 @@
     $ENV{'PBCONF'} = $pbconfdir{$ENV{'PBPROJ'}};
 } else {
-    pb_log(0,"WARNING: no pbconfdir defined, using $ENV{'PBDIR'}/$ENV{'PBPROJ'}/pbconf\n");
+    pb_log(0,"WARNING: no pbconfdir defined, using $ENV{'PBDEFDIR'}/$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";
-}
+    $ENV{'PBCONF'} = "$ENV{'PBDEFDIR'}/$ENV{'PBPROJ'}/pbconf";
+}
+
+# Expand potential env variable in it
+eval { $ENV{'PBCONF'} =~ s/(\$ENV.+\})/$1/eeg };
 pb_log(2,"PBCONF: $ENV{'PBCONF'}\n");
 
@@ -230 +234 @@
 
 # Check where is our PBROOT (release tag name can't be guessed the first time)
+#
 if (not defined $ENV{'PBROOT'}) {
     if (! -f ("$ENV{'PBDESTDIR'}/pbrc")) {