Changeset 199 in ProjectBuilder for devel/pb

Timestamp:

Oct 12, 2007, 2:02:02 AM (17 years ago)

Author:

Bruno Cornec

Message:

Handles newver (begining of skeleton)
improve VM stop + messages

Location:

devel/pb

Files:

• bin/pb (modified) (12 diffs)
• contrib/pbsetupqemu (modified) (1 diff)
• lib/ProjectBuilder/Base.pm (modified) (1 diff)

devel/pb/bin/pb

@@ -43 +43 @@
 my $pbaccount;              # Login to use to connect to the VM
 my $pbport;                 # Port to use to connect to the VM
+my $newver;                 # New version to create
 my $LOG = \*STDOUT;
 
-getopts('a:hl:m:P:p:qr:s:tv',\%opts);
+getopts('a:hl:m:P:p:qr:s:tvV:',\%opts);
 
 my ($projectbuilderver,$projectbuilderrev) = pb_version_init();
@@ -86 +87 @@
 if (defined $opts{'P'}) {
     $pbport = $opts{'P'};
+}
+if (defined $opts{'V'}) {
+    $newver = $opts{'V'};
 }
 
@@ -132 +136 @@
 } elsif ($action =~ /^script2vm$/) {
     pb_script2vm($pbscript);
+} elsif ($action =~ /^newver$/) {
+    pb_newver();
 } elsif ($action =~ /^clean$/) {
 } else {
@@ -374 +380 @@
             chdir "$pbpkg-$pbver" || die "Unable to chdir to $pbpkg-$pbver";
             symlink "pbconf/$ddir-$dver","debian" || die "Unable to symlink to pbconf/$ddir-$dver";
+            chmod 0755,"debian/rules";
             pb_system("dpkg-buildpackage -us -uc -rfakeroot","Building package");
             $made="$made $pbpkg"."_*.deb $pbpkg"."_*.dsc $pbpkg"."_*.tar.gz";
@@ -552 +559 @@
         print KEEP "$made\n";
         close(KEEP);
-        pb_system("ssh -q -p $port $mac \"rm -rf $tdir\"","VM cleanup on $mac");
+        pb_system("ssh -q -p $port $mac \"rm -rf $tdir $bdir\"","VM cleanup on $mac");
         if (! $vmexist) {
-            pb_system("ssh -q -p $port $mac \"sudo /usr/bin/poweroff \"; sleep 120 ; echo \'if [ -d /proc/$vmexist ]; then kill $vmexist; fi \' | bash ; sleep 10","VM halt on $mac");
+            pb_system("ssh -q -p $port $mac \"sudo /usr/bin/poweroff \"; sleep 120 ; echo \'if [ -d /proc/$vmexist ]; then kill -9 $vmexist; fi \' | bash ; sleep 10","VM $vm halt (pid $vmexist)");
         }
         pb_send2ssh("Packages","$odir"."_"."$over");
@@ -577 +584 @@
         my $vmexist = pb_launchvm($v);
         if (! $vmexist) {
-            pb_system("sleep 300","Waiting for it to come up");
+            pb_system("sleep 300","Waiting for $v to come up");
+        } else {
+            print "Using VM pid $vmexist\n";
         }
 
@@ -635 +644 @@
         die "VM of type $vmtype not supported. Report to the dev team";
     }
-    my $vmexist = pb_check_ps($vmcmd,$vmm);
+    my ($tmpcmd,$void) = split(/ +/,$cmd);
+    my $vmexist = pb_check_ps($tmpcmd,$vmm);
     if (! $vmexist) {
-        pb_system("$cmd &","Launching the VM");
+        pb_system("$cmd &","Launching the VM $vmm");
     }
     return($vmexist);
@@ -674 +684 @@
         my $vmexist = pb_launchvm($v);
         if (! $vmexist) {
-            pb_system("sleep 300","Waiting for it to come up");
+            pb_system("sleep 300","Waiting for $v to come up");
+        } else {
+            print "Using VM pid $vmexist\n";
         }
 
@@ -681 +693 @@
         pb_send2ssh("VMs","$v",$vmexist,"vmhost","vmlogin","pbrc","vmport");
     }
+}
+
+sub pb_newver {
+
+    my $cms=pb_cms_init($ENV{'PBPROJ'});
+    if ($cms->{$ENV{'PBPROJ'}} ne "svn") {
+        die "Only SVN is supported at the moment";
+    }
+    my $res = pb_cms_isdiff($cms);
+    die "You need to have no differences before creating a new version" if ($res != 0);
+    my $cmsurl = pb_cms_getinfo($cms);
+    my $newurl = dirname($cmsurl).$newver;
+    pb_cms_copy($cmsurl,$newurl);
+    pb_cms_checkout($newurl);
 }
 
@@ -789 +815 @@
     print "             to connect on the related VMs.\n";
     print "\n";
+    print "-P port    : Number of the port to use\n";
+    print "             to connect on the related VMs.\n";
+    print "\n";
     print "-p project : Name of the project you're working on\n";
     print "             (or use the env variable PBPROJ)     \n";
@@ -794 +823 @@
     print "-r pbroot  : Path Name of project under the CMS \n";
     print "             (or use the env variable PBROOT)   \n";
+    print "\n";
+    print "-V newver  : New version of the project to create\n";
+    print "             from the current one.              \n";
     print "\n";
     print "<action> can be:\n";
@@ -821 +853 @@
     print "\t           and executes a script on it                 \n";
     print "\n";
-}
+    print "\tnewver:    Create a new version of the project derived \n";
+    print "\t           from the current one                        \n";
+    print "\n";
+}

devel/pb/contrib/pbsetupqemu

@@ -92 +92 @@
     chomp($topbuilddir);
 
-    my $p = `rpm -q afio`;
-    chomp($p);
-    if ($p !~ /^afio/) {
-        system "rm -f afio-* ; wget ftp://ftp.mondorescue.org/src/afio-2.4.7-1.src.rpm ; rpm -ivh afio-2.4.7-1.src.rpm ; rpmbuild -ba $topbuilddir/SPECS/afio.spec ; chmod 644 $topbuilddir/RPMS/*/*.rpm";
-    }
-    $p = `rpm -q buffer`;
-    chomp($p);
-    if ($p !~ /^buffer/) {
-        system "rm -f buffer-* ; wget ftp://ftp.mondorescue.org/src/buffer-1.19-1.src.rpm ; rpm -ivh buffer-1.19-1.src.rpm ; rpmbuild -ba $topbuilddir/SPECS/buffer.spec ; chmod 644 $topbuilddir/RPMS/*/*.rpm";
-    }
     if ( $dver <= 4 ) {
         # FC4 - AppConfig unavailable

devel/pb/lib/ProjectBuilder/Base.pm

@@ -13 +13 @@
 use AppConfig qw(ARGCOUNT_HASH);
 use Data::Dumper;
+
+use ProjectBuilder::Changelog qw (pb_changelog);
 
 $ENV{'PBETC'} = "$ENV{'HOME'}/.pbrc";