Changeset 1540 in ProjectBuilder

Timestamp:

May 13, 2012, 1:03:52 PM (12 years ago)

Author:

Bruno Cornec

Message:

• vmmonport is now optional
• vmmem is also now really optional (wasn't working before as wasn't correctly tested)
• We are allowed to kill the sleep during VMs wait without it aborting the process
• newv(e|m) doesn't require execution of cms2build before being available
• Fix another git support error introduced earlier

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (2 diffs)
• pb-modules/lib/ProjectBuilder/Env.pm (modified) (1 diff)
• pb-modules/lib/ProjectBuilder/VCS.pm (modified) (1 diff)
• pb/bin/pb (modified) (4 diffs)

devel/pb-modules/lib/ProjectBuilder/Distribution.pm

@@ -112 +112 @@
     'nover' => "false",
     'rmdot' => "false",
+    'useminor' => "false",
     };
 $pbos->{'name'} = shift;
@@ -644 +645 @@
 sub pb_distro_get_param {
 
-my @param;
+my @param = ();
 my $pbos = shift;
 

devel/pb-modules/lib/ProjectBuilder/Env.pm

@@ -1210 +1210 @@
     umask 0022;
     return(\%filteredfiles, \%supfiles, \%defpkgdir, \%extpkgdir);
+} elsif ($action =~ /^newv/) {
+    # No PBDESTDIR yet so doing nothing
+    return;
 } else {
     # Setup the variables from what has been stored at the end of cms2build

devel/pb-modules/lib/ProjectBuilder/VCS.pm

@@ -267 +267 @@
 } elsif ($scheme =~ /^git/) {
     open(GIT,"git --git-dir=$dir/.git remote -v |") || return("");
-    while (<GITRC>) {
+    while (<GIT>) {
         next unless (/^origin\s+(\S+) \(push\)$/);
         return $1;
     }
-    close(GITRC);
+    close(GIT);
     warn "Unable to find origin remote for $dir";
     return "";

devel/pb/bin/pb

@@ -2314 +2314 @@
         die "-i iso parameter needed" if (((not defined $iso) || ($iso eq "")) && ($create != 0));
 
-        # TODO: vmmonport should be optional
-        my ($ptr,$ptr2,$vmpath,$vmport,$vms,$vmmonport) = pb_conf_get("vmtype","vmcmd","vmpath","vmport","vmsize","vmmonport");
-        my ($vmopt,$vmmm,$vmtmout,$vmsnap,$vmbuildtm) = pb_conf_get_if("vmopt","vmmem","vmtmout","vmsnap","vmbuildtm");
+        my ($ptr,$ptr2,$vmpath,$vmport,$vms) = pb_conf_get("vmtype","vmcmd","vmpath","vmport","vmsize");
+        my ($vmopt,$vmmm,$vmtmout,$vmsnap,$vmbuildtm,$vmmonport) = pb_conf_get_if("vmopt","vmmem","vmtmout","vmsnap","vmbuildtm","vmmonport");
         my $vmsize = pb_distro_get_param($pbos,$vms);
 
@@ -2343 +2342 @@
 
         # How much memory to allocate for VMs
-        my $vmmem = pb_distro_get_param($pbos,$vmmm);
-        if (defined $vmmem) {
-            $ENV{'PBVMOPT'} .= " -m $vmmem";
+        if (defined $vmmm) {
+            my $vmmem = pb_distro_get_param($pbos,$vmmm);
+            if (defined $vmmem) {
+                $ENV{'PBVMOPT'} .= " -m $vmmem";
+            }
         }
 
@@ -2361 +2362 @@
             if (($vmtype eq "kvm") || ($vmtype eq "qemu")) {
                 # Configure the monitoring to automate the creation of the 'pb' snapshot
-                $ENV{'PBVMOPT'} .= " -serial mon:telnet::$vmmonport->{$ENV{'PBPROJ'}},server,nowait";
+                $ENV{'PBVMOPT'} .= " -serial mon:telnet::$vmmonport->{$ENV{'PBPROJ'}},server,nowait" if ((defined $vmmonport) && (defined $vmmonport->{$ENV{'PBPROJ'}}));
                 # In that case no snapshot call needed
                 $ENV{'PBVMOPT'} =~ s/ -snapshot//;
@@ -2424 +2425 @@
                 }
                 pb_system("$cmd &","Launching the VM $vmm");
-                # Using system allows to kill it externaly if needed
-                pb_system("sleep $ENV{'PBVMTMOUT'}","Waiting $ENV{'PBVMTMOUT'} s for VM $v to come up");
+                # Using system allows to kill it externaly if needed,sosupport that in the call
+                pb_system("sleep $ENV{'PBVMTMOUT'}","Waiting $ENV{'PBVMTMOUT'} s for VM $v to come up",undef,1);
                 $vmpid = pb_check_ps($tmpcmd,$vmm);
                 pb_log(0,"VM $vmm launched (pid $vmpid)\n");