Changeset 361

Timestamp:

04/07/08 23:42:10 (5 years ago)

Author:

bruno

Message:

Should fix #20

File:

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

devel/pb/bin/pb

@@ -1163 +1163 @@
 
     my ($scheme,$uri)=pb_cms_init($pbinit);
+
+    # Checking CMS repositories status
     my ($pburl) = pb_conf_get("pburl");
     my ($scheme2, $account, $host, $port, $path) = pb_get_uri($pburl->{$ENV{'PBPROJ'}});
@@ -1170 +1172 @@
     }
     my $res = pb_cms_isdiff($scheme,$ENV{'PBROOTDIR'});
-    die "You need to have no differences in $ENV{'PBROOTDIR'} before creating a new version" if ($res != 0);
+    die "ERROR: No differences accepted in CMS for $ENV{'PBROOTDIR'} before creating a new version" if ($res != 0);
 
     $res = pb_cms_isdiff($scheme2,$ENV{'PBDIR'});
-    die "You need to have no differences in $ENV{'PBDIR'} before creating a new version" if ($res != 0);
+    die "ERROR: No differences accepted in CMS for $ENV{'PBDIR'} before creating a new version" if ($res != 0);
 
     # Tree identical between PBCONFDIR and PBROOTDIR. The delta is what 
@@ -1182 +1184 @@
 
     my $newurl = "$uri/".dirname($tmp)."/$newver";
-    pb_log(2,"Copying $uri to $newurl\n");
+    my $oldver= basename("$uri/$tmp");
+
+    # Checking pbcl files
+    foreach my $f (<$ENV{'PBCONFDIR'}/*/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\n") if ($foundnew == 0);
+    }
+
+    pb_log(2,"Copying $uri/$tmp to $newurl\n");
     #pb_cms_copy($scheme,$uri,$newurl);
     pb_log(2,"Checkout $newurl to $ENV{'PBDIR'}/../$newver\n");
     #pb_cms_checkout($scheme,$newurl,"$ENV{'PBDIR'}/../$newver");
-    my $oldver=basename($uri);
+
+    # Update the .pb file
+    # Should probably use projver in the old file
     open(FILE,"$ENV{'PBROOTDIR'}/../$newver/$ENV{'PBPROJ'}.pb") || die "Unable to open $ENV{'PBROOTDIR'}/../$newver/$ENV{'PBPROJ'}.pb";
     open(OUT,"> $ENV{'PBROOTDIR'}/../$newver/$ENV{'PBPROJ'}.pb.new") || die "Unable to write to $ENV{'PBROOTDIR'}/../$newver/$ENV{'PBPROJ'}.pb.new";
     while(<FILE>) {
-        s/projver\s+$ENV{'PBPROJ'}\s*=\s*$oldver/projver $ENV{'PBPROJ'} = $newver/;
+        s/^projver\s+$ENV{'PBPROJ'}\s*=\s*$oldver/projver $ENV{'PBPROJ'} = $newver/;
+        pb_log(0,"Changing projver from $oldver to $newver in $ENV{'PBROOTDIR'}/../$newver/$ENV{'PBPROJ'}.pb\n") if (/^projver\s+$ENV{'PBPROJ'}\s*=\s*$oldver/);
+        s/^testver/#testver/;
+        pb_log(0,"Commenting testver in $ENV{'PBROOTDIR'}/../$newver/$ENV{'PBPROJ'}.pb\n") if (/^testver/);
         print OUT $_;
     }
@@ -1197 +1217 @@
     rename("$ENV{'PBROOTDIR'}/../$newver/$ENV{'PBPROJ'}.pb.new","$ENV{'PBROOTDIR'}/../$newver/$ENV{'PBPROJ'}.pb");
     pb_log(2,"Checkin $ENV{'PBROOTDIR'}/../$newver\n");
+
     #pb_cms_checkin($scheme,"$ENV{'PBROOTDIR'}/../$newver");
 }