Changeset 358 in ProjectBuilder

Timestamp:

Apr 7, 2008, 11:07:33 PM (16 years ago)

Author:

Bruno Cornec

Message:

Preliminary tests for the new newvm action (test only)

Location:

devel/pb

Files:

• bin/pb (modified) (5 diffs)
• lib/ProjectBuilder/Base.pm (modified) (4 diffs)

devel/pb/bin/pb

@@ -1163 +1163 @@
 
     my ($scheme,$uri)=pb_cms_init($pbinit);
+    my ($pburl) = pb_conf_get("pburl");
+    my ($scheme2, $account, $host, $port, $path) = pb_get_uri($pburl->{$ENV{'PBPROJ'}});
 
     if ($scheme !~ /^svn/) {
         die "Only SVN is supported at the moment";
     }
-    my $res = pb_cms_isdiff($scheme);
-    die "You need to have no differences before creating a new version" if ($res != 0);
-    my $cmsurl = pb_cms_getinfo($scheme,$ENV{'PBROOTDIR'},"URL:");
-    my $newurl = dirname($cmsurl)."/$newver";
-    pb_cms_copy($scheme,$cmsurl,$newurl);
-    pb_cms_checkout($scheme,$newurl,"$ENV{'PBROOTDIR'}/../$newver");
-    my $oldver=basename($cmsurl);
-    open(FILE,"$ENV{'PBROOTDIR'}/../$newver/pbconf/$ENV{'PBPROJ'}.pb") || die "Unable to open $ENV{'PBROOTDIR'}/../$newver/pbconf/$ENV{'PBPROJ'}.pb";
-    open(OUT,"> $ENV{'PBROOTDIR'}/../$newver/pbconf/$ENV{'PBPROJ'}.pb.new") || die "Unable to write to $ENV{'PBROOTDIR'}/../$newver/pbconf/$ENV{'PBPROJ'}.pb.new";
+    my $res = pb_cms_isdiff($scheme,$ENV{'PBROOTDIR'});
+    die "You need to have no differences in $uri before creating a new version" if ($res != 0);
+
+    $res = pb_cms_isdiff($scheme2,$ENV{'PBDIR'});
+    die "You need to have no differences in $pburl->{$ENV{'PBPROJ'}} before creating a new version" if ($res != 0);
+
+    # Tree identical between PBCONFDIR and PBROOTDIR. The delta is what 
+    # 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";
+    pb_log(2,"Copying $uri 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");
+    my $oldver=basename($uri);
+    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";
     while(<FILE>) {
         s/projver\s+$ENV{'PBPROJ'}\s*=\s*$oldver/projver $ENV{'PBPROJ'} = $newver/;
@@ -1182 +1195 @@
     close(FILE);
     close(OUT);
-    rename("$ENV{'PBROOTDIR'}/../$newver/pbconf/$ENV{'PBPROJ'}.pb.new","$ENV{'PBROOTDIR'}/../$newver/pbconf/$ENV{'PBPROJ'}.pb");
-    pb_cms_checkin($scheme,"$ENV{'PBROOTDIR'}/../$newver");
+    rename("$ENV{'PBROOTDIR'}/../$newver/$ENV{'PBPROJ'}.pb.new","$ENV{'PBROOTDIR'}/../$newver/$ENV{'PBPROJ'}.pb");
+    pb_log(2,"Checkin $ENV{'PBROOTDIR'}/../$newver\n");
+    #pb_cms_checkin($scheme,"$ENV{'PBROOTDIR'}/../$newver");
 }
 
@@ -1391 +1405 @@
 
 system "rm -rf project-builder-* ; wget --passive-ftp ftp://ftp.mondorescue.org/src/project-builder-latest.tar.gz ; tar xvfz project-builder-latest.tar.gz ; cd project-builder-* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf project-builder-*";
+system "pb 2>&1 | head -5";
 EOF
     if ((! $vmexist) && ($vtype eq "vm")) {
@@ -1456 +1471 @@
     }
 } elsif (( $dfam eq "rh" ) || ($ddir eq "sles") || (($ddir eq "suse") && (($dver eq "10.1") || ($dver eq "10.0"))) || ($ddir eq "slackware")) {
-    # Suppose pkg are installed already
+    # Suppose pkg are installed already as no online mirror available
     system "rpm -e lsb 2>&1 > /dev/null";
     system "$insdm";
-    if ($ddir eq "slackware") {
-        system "$insmb";
-        system "$insfm";
-        system "$insfb";
-    }
+    system "$insmb";
+    system "$insfm";
+    system "$insfb";
 } elsif ($ddir eq "suse") { 
     # New OpenSuSE
+    system "$insmb";
+    system "$insfm";
+    system "$insfb";
     system "export TERM=linux ; liste=\"\" ; for i in make wget patch sudo perl-DateManip perl-File-HomeDir 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";
 } elsif ( $dfam eq "md" ) {
@@ -1477 +1493 @@
     if (( $dver eq "3.1" ) && ($ddir eq "debian")) {
         #system "apt-get update";
-        system "apt-get -y install wget patch ssh sudo debian-builder dh-make fakeroot ntpdate libfile-mimeinfo-perl libdate-manip-perl";
+        system "$insfb";
+        system "$insfm";
+        system "apt-get -y install wget patch ssh sudo debian-builder dh-make fakeroot ntpdate libmodule-build-perl libdate-manip-perl";
     } else  {
-        system "apt-get update; apt-get -y install wget patch openssh-server dpkg-dev sudo debian-builder dh-make fakeroot ntpdate rses5-dev libfile-mimeinfo-perl libdate-manip-perl";
+        system "apt-get update; apt-get -y install wget patch openssh-server dpkg-dev sudo debian-builder dh-make fakeroot ntpdate libfile-mimeinfo-perl libmodule-build-perl libdate-manip-perl";
     }
 } elsif ( $dfam eq "gen" ) {
-        system "emerge -u system ; emerge wget sudo ntp DateManip";
+        #system "emerge -u system ; emerge wget sudo ntp DateManip File-MimeInfo";
+        system "emerge wget sudo ntp DateManip File-MimeInfo";
 } else {
     print "No pkg to install\n";

devel/pb/lib/ProjectBuilder/Base.pm

@@ -181 +181 @@
 
 #
-# The following part is only useful when in cms2build
+# The following part is only useful when in cms2something of newver
 # In VMs/VEs we want to skip that by providing good env vars.
 # return values in that case are useless
 #
-if ($action =~ /^cms2/) {
+if (($action =~ /^cms2/) || ($action =~ /^newver$/)) {
 
     #
@@ -228 +228 @@
         die "$ENV{'PBROOTDIR'} is not a directory" if (not -d $ENV{'PBROOTDIR'});
     }
+
+    return  if ($action =~ /^newver$/);
 
     my %version = ();
@@ -1341 +1343 @@
 sub pb_cms_isdiff {
 my $scheme = shift;
+my $dir =shift;
 
 if ($scheme =~ /^svn/) {
-    open(PIPE,"svn diff $ENV{'PBROOTDIR'} |") || die "Unable to get svn diff from $ENV{'PBROOTDIR'}";
+    open(PIPE,"svn diff $dir |") || die "Unable to get svn diff from $dir";
     my $l = 0;
     while (<PIPE>) {
@@ -1351 +1354 @@
 } elsif ($scheme eq "flat") {
 } elsif ($scheme =~ /^cvs/) {
+    open(PIPE,"cvs diff $dir |") || die "Unable to get svn diff from $dir";
+    my $l = 0;
+    while (<PIPE>) {
+        # Skipping normal messages
+        next if (/^cvs diff:/);
+        $l++;
+    }
+    return($l);
 } else {
     die "cms $scheme unknown";