Changeset 128 in ProjectBuilder

Timestamp:

Sep 10, 2007, 12:16:45 PM (17 years ago)

Author:

Bruno Cornec

Message:

More fixes in the vm part

File:

• devel/pb/bin/pb (modified) (8 diffs)

devel/pb/bin/pb

@@ -422 +422 @@
     my $basesrc = map { basename($_) } split(/ /,$src);
 
-    print $LOG "$cmt: $src\n" if ($debug >= 0);
+    print $LOG "Sources handled ($cmt): $src\n" if ($debug >= 0);
     my ($sshhost,$sshlogin,$sshdir,$sshport) = pb_conf_get($host,$login,$dir,$port);
     my $mac = "$sshlogin->{$ENV{'PBPROJ'}}\@$sshhost->{$ENV{'PBPROJ'}}";
@@ -429 +429 @@
         $tdir = "$sshdir->{$ENV{'PBPROJ'}}/src";
     } elsif ($cmt eq "VMs") {
-        $tdir = "$sshdir->{$ENV{'PBPROJ'}}";
+        $tdir = basename("$sshdir->{$ENV{'PBPROJ'}}");
     } elsif ($cmt eq "Packages") {
         $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$ddir/$dver";
@@ -440 +440 @@
     pb_system("ssh -q -p $port $mac \"echo \'cd $tdir ; if [ -f pbscript ]; then ./pbscript; rm -f ./pbscript; fi\' | bash\"","Executing pbscript on $mac  if needed");
     if ($cmt eq "VMs") {
-            # Get back info on pkg produced, compute their name and get them from the VM
+        # Get back info on pkg produced, compute their name and get them from the VM
         pb_system("scp -p -P $port $mac:$tdir/pbgen-$pbprojver$pbprojtag $ENV{'PBBUILDDIR'}","Get package names in $tdir on $mac");
         open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$pbprojver$pbprojtag") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen-$pbprojver$pbprojtag";
@@ -461 +461 @@
     print SCRIPT "echo ... Execution needed\n";
     print SCRIPT "# Move the copied .pbrc to the home dir on the build account\n";
-    print SCRIPT "mv .pbrc \$ENV{'HOME'}\n";
+    print SCRIPT "mv .pbrc \$HOME\n";
     print SCRIPT "# Setup the variables required for building\n";
     print SCRIPT "export PBPROJ=$ENV{'PBPROJ'}\n";
@@ -468 +468 @@
     my $p = "";
     $p = $ARGV[0] if (defined $ARGV[0]);
+    print SCRIPT "echo Building packages on $vm\n";
     print SCRIPT "pb build2pkg $p\n";
+    print SCRIPT "echo End of build. Halting VM.\n";
     print SCRIPT "sudo halt -p\n";
     close(SCRIPT);
@@ -478 +480 @@
     foreach my $v (@$vm) {
         # Launch the VMs
-        my ($ptr) = pb_conf_get("vmtype");
+        my ($ptr,$vmopt,$vmport,$vmpath) = pb_conf_get("vmtype","vmopt","vmport","vmpath");
         my $vmtype = $ptr->{$ENV{'PBPROJ'}};
-        my ($vmopt,$vmport,$vmpath) = pb_conf_read("$ENV{'PBETC'}","vmopt","vmport","vmpath");
-        $vmopt->{$vmtype} = $vmopt->{'default'} if ((not defined $vmopt->{$vmtype}) and (defined $vmopt->{'default'}));
-        $vmport->{$vmtype} = $vmport->{'default'} if ((not defined $vmport->{$vmtype}) and (defined $vmport->{'default'}));
-        $vmpath->{$vmtype} = $vmpath->{'default'} if ((not defined $vmpath->{$vmtype}) and (defined $vmpath->{'default'}));
-        if (defined $vmopt->{$vmtype}) {
-            $ENV{'PBVMOPT'} = $vmopt->{$vmtype};
+        if (defined $vmopt->{$ENV{'PBPROJ'}}) {
+            $ENV{'PBVMOPT'} = $vmopt->{$ENV{'PBPROJ'}};
         } else {
             $ENV{'PBVMOPT'} = "";
@@ -509 +507 @@
                 $qemucmd = "$qemucmd32";
             }
-            if (! -f "$vmpath->{$vmtype}/$v.qemu") {
-                print "Unable to find VM $vmpath->{$vmtype}/$v.qemu";
+            if (! -f "$vmpath->{$ENV{'PBPROJ'}}/$v.qemu") {
+                print "Unable to find VM $vmpath->{$ENV{'PBPROJ'}}/$v.qemu";
                 next;
             }
-            $cmd = "$qemucmd $ENV{'PBVMOPT'} -redir tcp:$vmport->{$vmtype}:10.0.2.15:22 $vmpath->{$vmtype}/$v.qemu"
+            $cmd = "$qemucmd $ENV{'PBVMOPT'} -redir tcp:$vmport->{$ENV{'PBPROJ'}}:10.0.2.15:22 $vmpath->{$ENV{'PBPROJ'}}/$v.qemu"
         } elsif ($vmtype eq "xen") {
         } elsif ($vmtype eq "vmware") {
@@ -523 +521 @@
 
         # Gather all required files to send them to the VM and launch the build thourgh pbscript
-        pb_send2ssh("VMs","$v","vmhost","vmlogin",dirname($pbrc->{$ENV{'PBPROJ'}}),"vmport");
+        pb_send2ssh("VMs","$v","vmhost","vmlogin","pbrc","vmport");
     }
 }