Changeset 527 in ProjectBuilder for devel/pb/lib/ProjectBuilder/CMS.pm

Timestamp:

Aug 8, 2008, 8:57:39 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Fix CVS export functin to also use tags passed in param.
• Backport build fixes from 0.9.3

File:

• devel/pb/lib/ProjectBuilder/CMS.pm (modified) (2 diffs)

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -196 +196 @@
         $tmp1 = $uri;
     }
-    my $optcvs = "";
-
     # If we're working on the CVS itself
     my $cvstag = basename($ENV{'PBROOTDIR'});
@@ -313 +311 @@
     return;
 } elsif ($scheme =~ /^cvs/) {
-    pb_system("cvs co $url $destination","Checking out $url to $destination ");
+    my ($scheme, $account, $host, $port, $path) = pb_get_uri($url);
+
+    # If we're working on the CVS itself
+    my $cvstag = basename($ENV{'PBROOTDIR'});
+    my $cvsopt = "";
+    if ($cvstag eq "cvs") {
+        my @date = pb_get_date();
+        my $pbdate = strftime("%Y-%m-%d %H:%M:%S", @date);
+        $cvsopt = "-D \"$pbdate\"";
+    } else {
+        # we're working on a tag which should be the last part of PBROOTDIR
+        $cvsopt = "-r $cvstag";
+    }
+    pb_mkdir_p("$destination");
+    pb_system("cd $destination ; cvs -d $account\@$host:$path co $cvsopt .","Checking out $url to $destination");
 } elsif ($scheme =~ /^file/) {
     pb_cms_export($url,undef,$destination);