Changeset 2253 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Conf.pm

Timestamp:

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

Author:

Bruno Cornec

Message:

More YAML transformations

• We now generate a .pbrc.yml if none exist
• If no .pbrc.yml is found but a former .pbrc is there convert it automatically
• Adds a function pb_conf_update_v0 to convert automatically v0 conf files into v1 conf files
• pb_conf_cache now handles multi lines and can be used for filter management by pb_get_filters

File:

• devel/pb-modules/lib/ProjectBuilder/Conf.pm (modified) (2 diffs)

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

@@ -192 +192 @@
         if (/^\s*([A-z0-9-_.]+)\s+([[A-z0-9-_.\?\[\]\*\+\\]+)\s*=\s*(.*)$/) {
             pb_log(3,"DEBUG: 1:$1 2:$2 3:$3\n");
-            $lh->{$1}->{$2}=$3;
+            my ($what, $var, $value) = ($1, $2, $3);
+            # Add support for multi-lines
+            while ($value =~ s/\\\s*$//o) {
+                $_ = <CONF>;
+                die "Still processing continuations for $what $var at EOF" if (not defined $_);
+                s/[\r\n]//go;
+                $value .= "\n$_";
+            }
+            $lh->{$what}->{$var}=$value;
+        } elsif ((/^\s*#/o) || (/^\s*$/o)) {
+            # ignore
+        } else {
+            chomp();
+            warn "unexpected line '$_' in $f";
         }
     }
@@ -513 +526 @@
 }
 
+=item B<pb_conf_update_v0>
+
+This function transform the old configuration v0 file as first param into a new v1 one as second param
+
+=cut
+
+sub pb_conf_update_v0 {
+
+my $orig = shift;
+my $dest = shift;
+
+open(ORIG,$orig) || confess "Unable to open $orig";
+confess "Will not erase existing $dest while transforming $orig" if (-f $dest);
+open(DEST,"> $dest") || confess "Unable to write into $dest";
+print DEST "--- %YAML 1.0\n";
+my $parambkp = "";
+my $pbconfverbkp = $PBCONFVER;
+# We force migration from v0 to v1
+$PBCONFVER = 0;
+my $lh0;
+$lh0 = pb_conf_cache($orig,$lh0);
+$PBCONFVER = $pbconfverbkp;
+
+# We can't just write the YAML if we want to ckeep comments !
+while (<ORIG>) {
+    if ($_ =~ /^#/) {
+        # Keep comments
+        print DEST $_;
+    } else {
+        if (/^\s*([A-z0-9-_]+)\s+(.+)$/) {
+            # Handle parameters
+            my ($param,$void) = ($1, $2);
+            print DEST "  $param:\n" if ($param ne $parambkp);
+            print DEST "    $lh0->{$param} $lh0->{$param}->{$var}\n";
+            $parambkp = $param;
+        } else {
+            pb_log(0,"Unable to handle line $_\n");
+        }
+    }
+}
+close(ORIG);
+close(DEST);
+return();
+}
+
 =back