Changeset 262 in ProjectBuilder

Timestamp:

Oct 27, 2007, 2:18:22 AM (16 years ago)

Author:

Bruno Cornec

Message:

Fix bug #7 where .pbrc nearly empty wasn't working

Location:

devel/pb

Files:

• bin/pb (modified) (11 diffs)
• contrib/installpb (added)
• contrib/installqemu (added)
• contrib/updateqemu (modified) (2 diffs)
• lib/ProjectBuilder/Base.pm (modified) (2 diffs)

devel/pb/bin/pb

@@ -44 +44 @@
 my $pbport;                 # Port to use to connect to the VM
 my $newver;                 # New version to create
+my $iso;                    # ISO iage for the VM to create
 my $LOG = \*STDOUT;
 
-getopts('a:hl:m:P:p:qr:s:tvV:',\%opts);
+getopts('a:hi:l:m:P:p:qr:s:tvV:',\%opts);
 
 my ($projectbuilderver,$projectbuilderrev) = pb_version_init();
@@ -90 +91 @@
 if (defined $opts{'V'}) {
     $newver = $opts{'V'};
+}
+if (defined $opts{'i'}) {
+    $iso = $opts{'i'};
 }
 
@@ -136 +140 @@
     pb_build2vm();
 } elsif ($action =~ /^launchvm$/) {
-    pb_launchvm($ENV{'PBVM'});
+    pb_launchvm($ENV{'PBVM'},0);
 } elsif ($action =~ /^script2vm$/) {
     pb_script2vm($pbscript);
 } elsif ($action =~ /^newver$/) {
     pb_newver();
+} elsif ($action =~ /^newvm$/) {
+    pb_launchvm($ENV{'PBVM'},1);
 } elsif ($action =~ /^clean$/) {
 } else {
@@ -600 +606 @@
     foreach my $v (@$vm) {
         # Launch the VM
-        my ($vmexist,$vmpid) = pb_launchvm($v);
+        my ($vmexist,$vmpid) = pb_launchvm($v,0);
 
         # Gather all required files to send them to the VM 
@@ -611 +617 @@
 sub pb_launchvm {
     my $vm = shift;
-
+    my $create = shift || 0;        # By default do not create a VM
+
+    die "-i iso parameter needed" if (((not defined $iso) || ($iso eq "")) && ($create != 0));
     die "No VM defined, unable to launch" if (not defined $vm);
     # Keep only the first VM in case many were given
@@ -617 +625 @@
 
     # Launch the VMs
-    my ($ptr,$vmopt,$vmport,$vmpath,$vmtmout) = pb_conf_get("vmtype","vmopt","vmport","vmpath","vmtmout");
+    my ($ptr,$vmopt,$vmport,$vmpath,$vmtmout,$vmsize) = pb_conf_get("vmtype","vmopt","vmport","vmpath","vmtmout","vmsize");
     my $vmtype = $ptr->{$ENV{'PBPROJ'}};
+    if (not defined $ENV{'PBVMOPT'}) {
+        $ENV{'PBVMOPT'} = "";
+    }
     if (defined $vmopt->{$ENV{'PBPROJ'}}) {
-        $ENV{'PBVMOPT'} = $vmopt->{$ENV{'PBPROJ'}};
-    } else {
-        $ENV{'PBVMOPT'} = "";
+        $ENV{'PBVMOPT'} .= " $vmopt->{$ENV{'PBPROJ'}}";
     }
     my $nport = $vmport->{$ENV{'PBPROJ'}};
@@ -648 +657 @@
         }
         $vmm = "$vmpath->{$ENV{'PBPROJ'}}/$vm.qemu";
-        if (! -f "$vmm") {
-            die "Unable to find VM $vmm";
+        if ($create != 0) {
+            $ENV{'PBVMOPT'} .= " -cdrom $iso -boot d";
         }
         $cmd = "$vmcmd $ENV{'PBVMOPT'} -redir tcp:$nport:10.0.2.15:22 $vmm"
@@ -661 +670 @@
     my $vmpid = 0;
     if (! $vmexist) {
+        if ($create != 0) {
+            pb_system("/usr/bin/qemu-img create -f qcow2 $vmm $vmsize->{$ENV{'PBPROJ'}}","Creating the QEMU VM");
+        }
+        if (! -f "$vmm") {
+            die "Unable to find VM $vmm";
+        }
         pb_system("$cmd &","Launching the VM $vmm");
         pb_system("sleep $vmtmout->{$ENV{'PBPROJ'}}","Waiting for VM $vm to come up");
@@ -708 +723 @@
     foreach my $v (@$vm) {
         # Launch the VM
-        my ($vmexist,$vmpid) = pb_launchvm($v);
+        my ($vmexist,$vmpid) = pb_launchvm($v,0);
 
         # Gather all required files to send them to the VM 
@@ -715 +730 @@
     }
 }
+
 
 sub pb_newver {
@@ -888 +904 @@
     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";
-}
+    print "\tnewvm:     Create a new virtual machine\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/updateqemu

@@ -16 +16 @@
 
 export PBPROJ=pb
-export PBROOT=/users/bruno/pb/svn/0.8.5
+export PBROOT=/users/bruno/pb/svn/devel
 
 for m in $opt; do
@@ -27 +27 @@
     pb -m $m -a root -s /tmp/pbscript script2vm 
     sleep 120
-    job=`ps auhxww | grep qemu | grep -Ev 'grep|updateqemu' | awk '{print $2}'`
+    job=`ps auhxww | grep qemu | grep $m | grep -Ev 'grep|updateqemu' | awk '{print $2}'`
     if [ _"$job" != _"" ]; then
         echo "Really halting $m"

devel/pb/lib/ProjectBuilder/Base.pm

@@ -233 +233 @@
 my $p2;
 
+#print "DEBUG: param1: ".Dumper(@ptr1)."\n"; # if ($debug >= 1);
+#print "DEBUG: param2: ".Dumper(@ptr2)."\n"; # if ($debug >= 1);
+
 foreach my $i (0..$#param) {
-    die "No $param[$i] defined for $ENV{'PBPROJ'}" if ((not defined $ptr1[$i]) && (not defined $ptr2[$i]));
+    $p1 = $ptr1[$i];
+    $p2 = $ptr2[$i];
+    die "No $param[$i] defined for $ENV{'PBPROJ'}" if ((not defined @ptr1) && (not defined @ptr2));
+    die "No $param[$i] defined for $ENV{'PBPROJ'}" if ((not defined $p1) && (not defined $p2));
     # Always try to take the param from the home dir conf file in priority
     # in order to mask what could be defined under the CMS to allow for overloading
-    $p1 = $ptr1[$i];
-    $p2 = $ptr2[$i];
     if (not defined $p2) {
         # No ref in CMS project conf file so use the home dir one.
@@ -266 +270 @@
     }
     die "No $param[$i] defined for $ENV{'PBPROJ'}" if (not defined $p1->{$ENV{'PBPROJ'}});
-}
-#print "DEBUG: param: ".Dumper(@ptr)."\n" if ($debug >= 1);
+    $ptr1[$i] = $p1;
+    #print "DEBUG: param ptr1: ".Dumper(@ptr1)."\n"; # if ($debug >= 1);
+}
 return(@ptr1);
 }