Changeset 2258 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Env.pm

Timestamp:

Aug 30, 2017, 5:07:39 PM (7 years ago)

Author:

Bruno Cornec

Message:

Fix temporary files so they are also YAML and transform projects.pb files into YAML files as well

File:

• devel/pb-modules/lib/ProjectBuilder/Env.pm (modified) (12 diffs)

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

@@ -235 +235 @@
   *      *        *       |        |          |                *        *
  tag    dev    pbconf    ...    pbbuild  pbdelivery PBCONFDIR dev      tag                  
-  |               |                           |     PBDESTDIR           |
-  ---          ------                        pbrc   PBBUILDDIR       -------
+  |               |                         |       PBDESTDIR           |
+  ---          ------                    pbrc.yml   PBBUILDDIR       -------
     |          |    |                                                |     |
    1.1        dev  tag                                              1.0   1.1                PBDIR
@@ -246 +246 @@
                ----------------------------------
                |          |           |         |
-             pkg1      pbproj1.pb   pbfilter   pbcl
+             pkg1      pbproj1.yml   pbfilter   pbcl
                |
         -----------------
@@ -362 +362 @@
     #
     if (not defined $ENV{'PBROOTDIR'}) {
-        if (! -f ("$ENV{'PBDESTDIR'}/pbrc")) {
+        if (! -f ("$ENV{'PBDESTDIR'}/pbrc.yml")) {
             $ENV{'PBROOTDIR'} = "$ENV{'PBCONFDIR'}";
             pb_log(1,"WARNING: no pbroot defined, using $ENV{'PBROOTDIR'}\n");
@@ -368 +368 @@
             die "No directory found under $ENV{'PBCONFDIR'}" if (not defined $ENV{'PBROOTDIR'});
         } else {
-            my ($pbroot) = pb_conf_read_if("$ENV{'PBDESTDIR'}/pbrc","pbroot");
+            my ($pbroot) = pb_conf_read_if("$ENV{'PBDESTDIR'}/pbrc.yml","pbroot");
             # That's always the environment variable that will be used
-            die "Please remove inconsistent $ENV{'PBDESTDIR'}/pbrc" if ((not defined $pbroot) || (not defined $pbroot->{$ENV{'PBPROJ'}}));
+            die "Please remove inconsistent $ENV{'PBDESTDIR'}/pbrc.yml" if ((not defined $pbroot) || (not defined $pbroot->{$ENV{'PBPROJ'}}));
             $ENV{'PBROOTDIR'} = $pbroot->{$ENV{'PBPROJ'}};
         }
@@ -384 +384 @@
 
     # Adds that conf file to the list to consider
-    pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb") if (-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb");
+    pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml") if (-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml");
 
     return if ($action =~ /^(newver|getconf|setupve)$/);
@@ -394 +394 @@
     my %supfiles = ();
     
-    if ((-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb") and (not defined $pbinit)) {
+    if ((-f "$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml") and (not defined $pbinit)) {
 
         # List of pkg to build by default (mandatory)
@@ -422 +422 @@
                 $ENV{'PBPROJVER'}=$pkgv->{$ENV{'PBPROJ'}};
             } else {
-                die "No projver found in $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb";
+                die "No projver found in $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml";
             }
         }
-        die "Invalid version name $ENV{'PBPROJVER'} in $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb" if (($ENV{'PBPROJVER'} !~ /[0-9.]+/) && (defined $version) && ($ENV{'PBPROJVER'} =~ /$version{$ENV{'PBPROJ'}}/));
+        die "Invalid version name $ENV{'PBPROJVER'} in $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml" if (($ENV{'PBPROJVER'} !~ /[0-9.]+/) && (defined $version) && ($ENV{'PBPROJVER'} =~ /$version{$ENV{'PBPROJ'}}/));
         
         if (not defined $ENV{'PBPROJTAG'}) {
@@ -431 +431 @@
                 $ENV{'PBPROJTAG'}=$pkgt->{$ENV{'PBPROJ'}};
             } else {
-                die "No projtag found in $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb";
+                die "No projtag found in $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml";
             }
         }
-        die "Invalid tag name $ENV{'PBPROJTAG'} in $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb" if ($ENV{'PBPROJTAG'} !~ /[0-9.]+/);
+        die "Invalid tag name $ENV{'PBPROJTAG'} in $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml" if ($ENV{'PBPROJTAG'} !~ /[0-9.]+/);
     
     
@@ -441 +441 @@
                 $ENV{'PBPACKAGER'}=$pbpackager->{$ENV{'PBPROJ'}};
             } else {
-                die "No pbpackager found in $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb";
+                die "No pbpackager found in $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml";
             }
         }
@@ -449 +449 @@
             @pkgs = ("pkg1") if (not @pkgs);
     
-            open(CONF,"> $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb") || die "Unable to create $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb";
+            open(CONF,"> $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml") || die "Unable to create $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml";
             print CONF << "EOF";
 ---
@@ -1347 +1347 @@
             pb_vcs_checkin($pbconf{$ENV{'PBPROJ'}},"$pbconfpath",$msg);
         } else {
-            pb_log(0,"ERROR: no pbroot defined, used $ENV{'PBROOTDIR'}, without finding $ENV{'PBPROJ'}.pb in it\n");
+            pb_log(0,"ERROR: no pbroot defined, used $ENV{'PBROOTDIR'}, without finding $ENV{'PBPROJ'}.yml in it\n");
             pb_log(0,"       Please use -r release in order to be able to initialize your environment correctly\n");
-            die "Unable to open $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb";
+            die "Unable to open $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.yml";
         }
     }
@@ -1359 +1359 @@
 } else {
     # Setup the variables from what has been stored at the end of cms2build
-    my ($var) = pb_conf_read("$ENV{'PBDESTDIR'}/pbrc","pbroot");
+    my ($var) = pb_conf_read("$ENV{'PBDESTDIR'}/pbrc.yml","pbroot");
     $ENV{'PBROOTDIR'} = $var->{$ENV{'PBPROJ'}};
 
-    ($var) = pb_conf_read("$ENV{'PBDESTDIR'}/pbrc","projver");
+    ($var) = pb_conf_read("$ENV{'PBDESTDIR'}/pbrc.yml","projver");
     $ENV{'PBPROJVER'} = $var->{$ENV{'PBPROJ'}};
 
-    ($var) = pb_conf_read("$ENV{'PBDESTDIR'}/pbrc","projtag");
+    ($var) = pb_conf_read("$ENV{'PBDESTDIR'}/pbrc.yml","projtag");
     $ENV{'PBPROJTAG'} = $var->{$ENV{'PBPROJ'}};
 
-    ($var) = pb_conf_read("$ENV{'PBDESTDIR'}/pbrc","pbpackager");
+    ($var) = pb_conf_read("$ENV{'PBDESTDIR'}/pbrc.yml","pbpackager");
     $ENV{'PBPACKAGER'} = $var->{$ENV{'PBPROJ'}};