Changeset 2450 in ProjectBuilder

Timestamp:

Sep 7, 2019, 2:23:37 AM (5 years ago)

Author:

Bruno Cornec

Message:

Improve newver

• Fix #140 where one extra line was generated in the pbcl
• Improve testver hanfling in YAML

File:

• devel/pb/bin/pb (modified) (2 diffs)

devel/pb/bin/pb

@@ -3652 +3652 @@
         if (/^projver\s+$ENV{'PBPROJ'}\s*=\s*$oldvertxt$/) {
             s/^projver\s+$ENV{'PBPROJ'}\s*=\s*$oldvertxt$/projver $ENV{'PBPROJ'} = $newvertxt/;
+            pb_log(0,"Changing projver from $oldvertxt to $newvertxt in $ENV{'PBCONFDIR'}/$newver/$ENV{'PBPROJ'}.pb\n");
+        }
+        if (/^projver:\n\s+$ENV{'PBPROJ'}:\s*$oldvertxt$/) {
+            s/^projver:\n\s+$ENV{'PBPROJ'}:\s*$oldvertxt$/projver:\n  $ENV{'PBPROJ'}: $newvertxt/;
             pb_log(0,"Changing projver from $oldvertxt to $newvertxt in $ENV{'PBCONFDIR'}/$newver/$ENV{'PBPROJ'}.yml\n");
         }
         if (/^testver/) {
-            s/^testver/#testver/;
-            pb_log(0,"Commenting testver in $ENV{'PBCONFDIR'}/$newver/$ENV{'PBPROJ'}.yml\n") if (/^testver/);
+            s/^testver:\n\s+$ENV{'PBPROJ'}:(.*)$/#testver:\n#\s+$ENV{'PBPROJ'}: $1/;
+            pb_log(0,"Commenting testver in $ENV{'PBCONFDIR'}/$newver/$ENV{'PBPROJ'}.yml\n");
+            my $txt = $_;
+            chomp($txt);
         }
         if (/^delivery/) {
@@ -3694 +3700 @@
                 pb_log(0,"WARNING: version $newvertxt not found in $f so added to $f2...\n") if ($foundnew == 0);
             }
-            if ($cnt <= 4) {
+            if ($cnt <= 3) {
                 print OUT "$_" if (not /^$oldvertxt \(/);
             } else {