Changeset 479 in ProjectBuilder

Timestamp:

Jun 5, 2008, 5:04:41 PM (17 years ago)

Author:

Bruno Cornec

Message:

Allows pbcl files to not have info on the new version and add it on the fly for newver action

File:

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

devel/pb/bin/pb

@@ -1337 +1337 @@
     my $oldver= basename($tmp);
 
-    # Checking pbcl files
-    foreach my $f (<$ENV{'PBROOTDIR'}/*/pbcl>) {
-        open(PBCL,$f) || die "Unable to open $f";
-        my $foundnew = 0;
-        while (<PBCL>) {
-            $foundnew = 1 if (/^$newver \(/);
-        }
-        close(PBCL);
-        die "ERROR: version $newver not found in $f" if ($foundnew == 0);
-    }
-
     # Duplicate and extract project-builder part
     pb_log(2,"Copying $uri/$tmp to $newurl\n");
@@ -1375 +1364 @@
     close(OUT);
     rename("$ENV{'PBROOTDIR'}/../$newver/$ENV{'PBPROJ'}.pb.new","$ENV{'PBROOTDIR'}/../$newver/$ENV{'PBPROJ'}.pb");
+
+    # Checking pbcl files
+    foreach my $f (<$ENV{'PBROOTDIR'}/*/pbcl>) {
+        open(PBCL,$f) || die "Unable to open $f";
+        my $foundnew = 0;
+        while (<PBCL>) {
+            $foundnew = 1 if (/^$newver \(/);
+        }
+        close(PBCL);
+        open(OUT,"> $f.new") || die "Unable to write to $f.new: $!";
+        open(PBCL,$f) || die "Unable to open $f";
+        while (<PBCL>) {
+            print OUT "$_"; if (not /^$oldver \(/);
+            if ((/^$oldver \(/) && ($foundnew == 0)) {
+                print OUT "$newver ($pbdate)\n";
+                print OUT "- TBD\n";
+                print OUT "\n";
+                pb_log(0,"WARNING: version $newver not found in $f so added..." if ($foundnew == 0);
+            }
+        }
+        close(OUT);
+        close(PBCL);
+        rename("$f.new","$f");
+    }
 
     pb_log(2,"Checkin $ENV{'PBROOTDIR'}/../$newver\n");