Changeset 208 in ProjectBuilder

Timestamp:

Oct 14, 2007, 8:36:47 PM (17 years ago)

Author:

Bruno Cornec

Message:

Improved newver again

Location:

devel/pb

Files:

• bin/pb (modified) (1 diff)
• lib/ProjectBuilder/Base.pm (modified) (2 diffs)

devel/pb/bin/pb

@@ -705 +705 @@
     my $newurl = dirname($cmsurl)."/$newver";
     pb_cms_copy($cms,$cmsurl,$newurl);
-    pb_cms_checkout($cms,$newurl,"$ENV{'PBROOT'}/..");
+    pb_cms_checkout($cms,$newurl,"$ENV{'PBROOT'}/../$newver");
+    my $oldver=basename($cmsurl);
+    open(FILE,"+<$ENV{'PBROOT'}/../$newver/pbconf/$ENV{'PBPROJ'}.pb") || die "Unable to open $ENV{'PBROOT'}/../$newver/pbconf/$ENV{'PBPROJ'}.pb";
+    while(<FILE>) {
+        s/projver[:space:]+$ENV{'PBPROJ'}[:space:]*=[:space:]*$oldver/projver $ENV{'PBPROJ'} = $newver/;
+    }
+    close(FILE);
+    pb_cms_checkin($cms,"$ENV{'PBROOT'}/../$newver");
 }
 

devel/pb/lib/ProjectBuilder/Base.pm

@@ -380 +380 @@
 
 if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
-    pb_system("svn copy $oldurl $newurl","Copying $oldurl to $newurl ");
+    pb_system("svn copy -m 'Creation of $newurl from $oldurl' $oldurl $newurl","Copying $oldurl to $newurl ");
 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
 } else {
@@ -394 +394 @@
 if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
     pb_system("svn co $url $destination","Checking $url to $destination ");
+} elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
+} else {
+    die "cms $cms->{$ENV{'PBPROJ'}} unknown";
+}
+}
+
+sub pb_cms_checkin {
+my $cms = shift;
+my $dir = shift;
+
+if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
+    pb_system("svn ci $dir","Checking in $dir");
+    pb_system("svn up $dir","Updating $dir");
 } elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
 } else {