Changeset 366 in ProjectBuilder for devel

Timestamp:

Apr 8, 2008, 12:28:44 AM (16 years ago)

Author:

Bruno Cornec

Message:

• We need to handle 2 repo in newvm, with the right URL. Should be fixed now
• Update the right pbcl file

File:

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

devel/pb/bin/pb

@@ -1162 +1162 @@
     die "-V Version parameter needed" if ((not defined $newver) || ($newver eq ""));
 
-    my ($scheme,$uri)=pb_cms_init($pbinit);
+    # Need this call for PBDIR
+    my ($scheme2,$uri) = pb_cms_init($pbinit);
+
+    my ($pbconf) = pb_conf_read("$ENV{'PBETC'}","pbconfurl");
+    $uri = $pbconf->{$ENV{'PBPROJ'}};
+    my ($scheme, $account, $host, $port, $path) = pb_get_uri($uri);
 
     # Checking CMS repositories status
     my ($pburl) = pb_conf_get("pburl");
-    my ($scheme2, $account, $host, $port, $path) = pb_get_uri($pburl->{$ENV{'PBPROJ'}});
+    ($scheme2, $account, $host, $port, $path) = pb_get_uri($pburl->{$ENV{'PBPROJ'}});
 
     if ($scheme !~ /^svn/) {
@@ -1184 +1189 @@
 
     my $newurl = "$uri/".dirname($tmp)."/$newver";
-    my $oldver= basename("$uri/$tmp");
+    # Should probably use projver in the old file
+    my $oldver= basename($tmp);
 
     # Checking pbcl files
-    foreach my $f (<$ENV{'PBCONFDIR'}/*/pbcl>) {
+    foreach my $f (<$ENV{'PBROOTDIR'}/*/pbcl>) {
         open(PBCL,$f) || die "Unable to open $f";
         my $foundnew = 0;
@@ -1197 +1203 @@
     }
 
+    # Duplicate and extract project-builder part
     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");
+    pb_cms_copy($scheme,"$uri/$tmp",$newurl);
+    pb_log(2,"Checkout $newurl to $ENV{'PBROOTDIR'}/../$newver\n");
+    pb_cms_checkout($scheme,$newurl,"$ENV{'PBCONFDIR'}/../$newver");
+
+    # 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($scheme,"$pburl->{$ENV{'PBPROJ'}}/$tmp",$newurl2);
+    pb_log(2,"Checkout $newurl2 to $ENV{'PBDIR'}/../$newver\n");
+    pb_cms_checkout($scheme,$newurl2,"$ENV{'PBDIR'}/../$newver");
 
     # 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";