Changeset 274 in ProjectBuilder for devel

Timestamp:

Nov 11, 2007, 2:22:50 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Do not continue with VM if something goes wrong
• Also build on 64 bits VMs when all

Location:

devel/pb

Files:

• bin/pb (modified) (6 diffs)
• contrib/pbsetupqemu (modified) (1 diff)

devel/pb/bin/pb

@@ -171 +171 @@
     foreach my $pbpkg (@pkgs) {
         $ENV{'PBPKG'} = $pbpkg;
+        $ENV{'PBVER'} = $pbprojver;
+        $ENV{'PBTAG'} = $pbprojtag;
         if ((defined $pkgv) && (defined $pkgv->{$pbpkg})) {
             $pbver = $pkgv->{$pbpkg};
@@ -400 +402 @@
         } elsif ($dtype eq "deb") {
             chdir "$ENV{'PBBUILDDIR'}" || die "Unable to chdir to $ENV{'PBBUILDDIR'}";
-            pb_system("tar xpfz $src","Extracting sources");
+            pb_system("tar xfz $src","Extracting sources");
 
             chdir "$pbpkg-$pbver" || die "Unable to chdir to $pbpkg-$pbver";
@@ -612 +614 @@
         my ($vmexist,$vmpid) = pb_launchvm($v,0);
 
+        # Skip that VM if it something went wrong
+        next if (($vmpid == 0) && ($vmexist ==0));
+
         # Gather all required files to send them to the VM 
         # and launch the build thourgh pbscript
@@ -678 +683 @@
         }
         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");
-        $vmpid = pb_check_ps($tmpcmd,$vmm);
+            print "Unable to find VM $vmm\n";
+        } else {
+            pb_system("$cmd &","Launching the VM $vmm");
+            pb_system("sleep $vmtmout->{$ENV{'PBPROJ'}}","Waiting for VM $vm to come up");
+            $vmpid = pb_check_ps($tmpcmd,$vmm);
+        }
     } else {
         print "Found an existing VM $vmm (pid $vmexist)\n";
@@ -730 +736 @@
         my ($vmexist,$vmpid) = pb_launchvm($v,0);
 
+        # Skip that VM if it something went wrong
+        next if (($vmpid == 0) && ($vmexist == 0));
+
         # Gather all required files to send them to the VM 
         # and launch the build thourgh pbscript
@@ -795 +804 @@
 if ((not defined $ENV{'PBVM'}) || ($ENV{'PBVM'} =~ /^all$/)) {
     my ($ptr) = pb_conf_get("vmlist");
-    $ENV{'PBVM'} = $ptr->{$ENV{'PBPROJ'}};
+    my $ptr2 = $ptr->{$ENV{'PBPROJ'}};
+    $ptr2 =~ s/,/_64,/g;
+    $ptr2 =~ s/$/_64/g;
+    $ENV{'PBVM'} = "$ptr->{$ENV{'PBPROJ'}},$ptr2";
     $all = 1;
 }
+print $LOG "VMs: $ENV{'PBVM'}\n";
 @vm = split(/,/,$ENV{'PBVM'});
-print $LOG "VMs: ".join(',',@vm)."\n";
 return(\@vm,$all);
 }

devel/pb/contrib/pbsetupqemu

@@ -133 +133 @@
 
 # Suse wants sudoers as 640
-if (($ddir eq "sles") || ($ddir eq "suse")) {
+if (($ddir eq "sles") || (($ddir eq "suse")) && ($dver ne "10.3")) {
     chmod 0640,$file;
 }