Changeset 1612 in ProjectBuilder for devel/pb/bin

Timestamp:

May 28, 2012, 11:33:12 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Newver should now handle better the pbcl files by skipping all text before the new version

File:

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

devel/pb/bin/pb

@@ -2958 +2958 @@
         open(OUT,"> $f2") || die "Unable to write to $f2: $!";
         open(PBCL,$f) || die "Unable to open $f";
+        # We skip as long as we do not reach the new version in the log (case of devel)
+        my $skip = 1;
+        # We let the 4 first lines
+        my $cnt = 0;
         while (<PBCL>) {
-            print OUT "$_" if (not /^$oldvertxt \(/);
+            $skip = 0 if (/^$newvertxt \(/);
             if ((/^$oldvertxt \(/) && ($foundnew == 0)) {
                 print OUT "$newvertxt ($pbdate)\n";
@@ -2966 +2970 @@
                 pb_log(0,"WARNING: version $newvertxt not found in $f so added to $f2...\n") if ($foundnew == 0);
             }
+            if ($cnt <= 4) {
+                print OUT "$_" if (not /^$oldvertxt \(/);
+            } else {
+                print OUT "$_" if ($skip == 0);
+            }
+            $cnt++;
         }
         close(OUT);