Changeset 2256 in ProjectBuilder

Timestamp:

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

Author:

Bruno Cornec

Message:

Transform v0 ve|vm|rm conf files into v1 if needed + fixes

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Conf.pm (modified) (2 diffs)
• pb-modules/lib/ProjectBuilder/Env.pm (modified) (1 diff)
• pb/bin/pb (modified) (1 diff)
• pb/lib/ProjectBuilder/Filter.pm (modified) (1 diff)

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

@@ -205 +205 @@
         } else {
             chomp();
-            warn "unexpected line '$_' in $f";
+            warn "unexpected line '$_' in $cf";
         }
     }
@@ -557 +557 @@
         if (/^\s*([A-z0-9-_]+)\s+(.+)$/) {
             # Handle parameters
-            my ($param,$void) = ($1, $2);
+            my ($param,$var) = ($1, $2);
             print DEST "  $param:\n" if ($param ne $parambkp);
             print DEST "    $lh0->{$param} $lh0->{$param}->{$var}\n";

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

@@ -207 +207 @@
         $p->{$ENV{'PBPROJ'}} = pb_path_expand($p->{$ENV{'PBPROJ'}});
         # TODO: should we add the conf files pointed by project default as well ?
-        pb_conf_add("$p->{$ENV{'PBPROJ'}}/.pbrc.yml") if (-f "$p->{$ENV{'PBPROJ'}}/.pbrc.yml");
+        if (-f "$p->{$ENV{'PBPROJ'}}/.pbrc.yml") {
+            pb_conf_add("$p->{$ENV{'PBPROJ'}}/.pbrc.yml");
+        } elsif (-f "$p->{$ENV{'PBPROJ'}}/.pbrc") {
+            pb_conf_update_v0("$p->{$ENV{'PBPROJ'}}/.pbrc","$p->{$ENV{'PBPROJ'}}/.pbrc.yml");
+            pb_conf_add("$p->{$ENV{'PBPROJ'}}/.pbrc.yml");
+            my ($pburl) = pb_conf_get("pburl");
+            my ($scheme, $account, $host, $port, $path) = pb_get_uri($pburl->{$ENV{'PBPROJ'}});
+            #pb_vcs_add_if_not_in($scheme,"$p->{$ENV{'PBPROJ'}}/.pbrc.yml");
+        }
     }
 }

devel/pb/bin/pb

@@ -3425 +3425 @@
         print SCRIPT "# Preparation for pb\n";
         print SCRIPT "rm -f \$HOME/.pbrc.yml\n";
+        print SCRIPT "rm -f \$HOME/.pbrc\n";
         print SCRIPT "cp .pbrc.yml \$HOME\n";
         # TODO: Why ?

devel/pb/lib/ProjectBuilder/Filter.pm

@@ -101 +101 @@
         push(@ffiles, $fyml);
     }
+}
 
 if (@ffiles) {