Changeset 527 in ProjectBuilder

Timestamp:

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

Author:

Bruno Cornec

Message:

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

Location:

devel/pb

Files:

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

devel/pb/bin/pb

@@ -1547 +1547 @@
     my ($pbac) = pb_conf_get($vtype."login");
     my ($key,$zero0,$zero1,$zero2);
-    my ($vmexist,$vmpid);
+    my ($vmexist,$vmpid,$ntps);
 
     if ($vtype eq "vm") {
@@ -1555 +1555 @@
         my ($vmhost,$vmport,$vmntp) = pb_conf_get("vmhost","vmport","vmntp");
         my $nport = $vmport->{$ENV{'PBPROJ'}};
+        $ntps = $vmntp->{$ENV{'PBPROJ'}};
         $nport = "$pbport" if (defined $pbport);
     
@@ -1620 +1621 @@
 
 # Sync date
-pb_system("/usr/sbin/ntpdate \$vmntp->{'PBPRROJ'}","Syncing date to \$vmntp{'PBPRROJ'}");
+pb_system("/usr/sbin/ntpdate $ntps","Syncing date to $ntps");
 
 EOF
@@ -1828 +1829 @@
     pb_system("$insfm","$cmtfm");
     pb_system("$insfb","$cmtfb");
+    pb_system("$insms","$cmtms");
     pb_system("export TERM=linux ; liste=\"\" ; for i in make wget patch sudo perl-DateManip perl-File-HomeDir perl-Mail-Sendmail perl-Locale-gettext xntp; do rpm -q \$i 1> /dev/null 2> /dev/null ; if [ \$\? != 0 ]; then liste=\"\$liste \$i\"; fi; done; echo \"Liste: \$liste\" ; if [ \"\$liste\" != \"\" ]; then yast2 -i \$liste ; fi","$cmtall");
 } elsif ( $dfam eq "md" ) {

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);