Changeset 1381 in ProjectBuilder

Timestamp:

Dec 23, 2011, 3:50:34 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Fix #93 by recoding newver partly and remove the fixed loading of a pb profile in KVM and put it in option

File:

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

devel/pb/bin/pb

@@ -2279 +2279 @@
             # Always redirect the network and always try to use a 'pb' snapshot
             #$cmd = "$vmcmd $ENV{'PBVMOPT'} -net user,hostfwd=tcp:$nport:10.0.2.15:22 -loadvm pb $vmm"
-            $cmd = "$vmcmd $ENV{'PBVMOPT'} -redir tcp:$nport:10.0.2.15:22 -loadvm pb $vmm"
+            $cmd = "$vmcmd $ENV{'PBVMOPT'} -redir tcp:$nport:10.0.2.15:22 $vmm"
         } elsif ($vmtype eq "xen") {
         } elsif ($vmtype eq "vmware") {
@@ -2562 +2562 @@
     # we want to get for the root of the new URL
 
-    my $tmp = $ENV{'PBROOTDIR'};
-    $tmp =~ s|^$ENV{'PBCONFDIR'}||;
-
-    my $newurl = "$uri/".dirname($tmp)."/$newver";
+    my $oldver = $ENV{'PBROOTDIR'};
+    $oldver =~ s|^$ENV{'PBCONFDIR'}||;
+
+    pb_log(2, "PBCONFDIR: $ENV{'PBCONFDIR'}\nPBROOTDIR: $ENV{'PBROOTDIR'}\n");
+
+    my $newurl = "$uri/$newver";
     # Should probably use projver in the old file
-    my $oldver= basename($tmp);
+    my $oldvertxt= basename($oldver);
+    my $newvertxt = basename($newver);
 
     # Duplicate and extract project-builder part
-    pb_log(2,"Copying $uri/$tmp to $newurl\n");
-    pb_cms_copy($scheme,"$uri/$tmp",$newurl);
-    pb_log(2,"Checkout $newurl to $ENV{'PBROOTDIR'}/../$newver\n");
-    pb_cms_up($scheme,"$ENV{'PBCONFDIR'}/..");
+    pb_log(2,"Copying $uri/$oldver to $newurl\n");
+    pb_cms_copy($scheme,"$uri/$oldver",$newurl);
+    pb_log(2,"Checkout $newurl to $ENV{'PBCONFDIR'}/$newver\n");
+    pb_cms_up($scheme,"$ENV{'PBCONFDIR'}");
 
     # Duplicate and extract project
-    my $newurl2 = "$pburl->{$ENV{'PBPROJ'}}/".dirname($tmp)."/$newver";
-
-    pb_log(2,"Copying $pburl->{$ENV{'PBPROJ'}}/$tmp to $newurl2\n");
-    pb_cms_copy($scheme2,"$pburl->{$ENV{'PBPROJ'}}/$tmp",$newurl2);
-    pb_log(2,"Checkout $newurl2 to $ENV{'PBDIR'}/../$newver\n");
-    pb_cms_up($scheme2,"$ENV{'PBDIR'}/..");
+    my $newurl2 = "$pburl->{$ENV{'PBPROJ'}}/$newver";
+
+    pb_log(2,"Copying $pburl->{$ENV{'PBPROJ'}}/$oldver to $newurl2\n");
+    pb_cms_copy($scheme2,"$pburl->{$ENV{'PBPROJ'}}/$oldver",$newurl2);
+
+    my $tmp = $ENV{'PBDIR'};
+    $tmp =~ s|$oldver$||;
+    pb_log(2,"Checkout $newurl2 to $tmp/$newver\n");
+    pb_cms_up($scheme2,"$tmp");
 
     # Update the .pb 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";
+    open(FILE,"$ENV{'PBCONFDIR'}/$newver/$ENV{'PBPROJ'}.pb") || die "Unable to open $ENV{'PBCONFDIR'}/$newver/$ENV{'PBPROJ'}.pb";
+    open(OUT,"> $ENV{'PBCONFDIR'}/$newver/$ENV{'PBPROJ'}.pb.new") || die "Unable to write to $ENV{'PBCONFDIR'}/$newver/$ENV{'PBPROJ'}.pb.new";
     while(<FILE>) {
-        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/);
-        pb_log(0,"Commenting testver in $ENV{'PBROOTDIR'}/../$newver/$ENV{'PBPROJ'}.pb\n") if (/^testver/);
-        s/^testver/#testver/;
+        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 (/^testver/) {
+            s/^testver/#testver/;
+            pb_log(0,"Commenting testver in $ENV{'PBCONFDIR'}/$newver/$ENV{'PBPROJ'}.pb\n") if (/^testver/);
+        }
+        if (/^delivery/) {
+            pb_log(0,"Please check delivery (".chomp($_).") in $ENV{'PBCONFDIR'}/$newver/$ENV{'PBPROJ'}.pb\n");
+        }
         print OUT $_;
-        pb_log(0,"Please check delivery (".chomp($_).") in $ENV{'PBROOTDIR'}/../$newver/$ENV{'PBPROJ'}.pb\n") if (/^delivery/);
     }
     close(FILE);
     close(OUT);
-    rename("$ENV{'PBROOTDIR'}/../$newver/$ENV{'PBPROJ'}.pb.new","$ENV{'PBROOTDIR'}/../$newver/$ENV{'PBPROJ'}.pb");
+    rename("$ENV{'PBCONFDIR'}/$newver/$ENV{'PBPROJ'}.pb.new","$ENV{'PBCONFDIR'}/$newver/$ENV{'PBPROJ'}.pb");
 
     # Checking pbcl files
@@ -2602 +2614 @@
         # Compute new pbcl file
         my $f2 = $f;
-        $f2 =~ s|$ENV{'PBROOTDIR'}|$ENV{'PBROOTDIR'}/../$newver/|;
+        $f2 =~ s|$ENV{'PBROOTDIR'}|$ENV{'PBCONFDIR'}/$newver/|;
         open(PBCL,$f) || die "Unable to open $f";
         my $foundnew = 0;
         while (<PBCL>) {
-            $foundnew = 1 if (/^$newver \(/);
+            $foundnew = 1 if (/^$newvertxt \(/);
         }
         close(PBCL);
@@ -2612 +2624 @@
         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 "$_" if (not /^$oldvertxt \(/);
+            if ((/^$oldvertxt \(/) && ($foundnew == 0)) {
+                print OUT "$newvertxt ($pbdate)\n";
                 print OUT "- TBD\n";
                 print OUT "\n";
-                pb_log(0,"WARNING: version $newver not found in $f so added to $f2...\n") if ($foundnew == 0);
+                pb_log(0,"WARNING: version $newvertxt not found in $f so added to $f2...\n") if ($foundnew == 0);
             }
         }
@@ -2624 +2636 @@
     }
 
-    pb_log(2,"Checkin $ENV{'PBROOTDIR'}/../$newver\n");
-    pb_cms_checkin($scheme,"$ENV{'PBROOTDIR'}/../$newver",undef);
+    pb_log(2,"Checkin $ENV{'PBCONFDIR'}/$newver\n");
+    pb_cms_checkin($scheme,"$ENV{'PBCONFDIR'}/$newver",undef);
 }