Changeset 274 in ProjectBuilder for devel/pb/bin
- Timestamp:
- Nov 11, 2007, 2:22:50 AM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb/bin/pb
r273 r274 171 171 foreach my $pbpkg (@pkgs) { 172 172 $ENV{'PBPKG'} = $pbpkg; 173 $ENV{'PBVER'} = $pbprojver; 174 $ENV{'PBTAG'} = $pbprojtag; 173 175 if ((defined $pkgv) && (defined $pkgv->{$pbpkg})) { 174 176 $pbver = $pkgv->{$pbpkg}; … … 400 402 } elsif ($dtype eq "deb") { 401 403 chdir "$ENV{'PBBUILDDIR'}" || die "Unable to chdir to $ENV{'PBBUILDDIR'}"; 402 pb_system("tar x pfz $src","Extracting sources");404 pb_system("tar xfz $src","Extracting sources"); 403 405 404 406 chdir "$pbpkg-$pbver" || die "Unable to chdir to $pbpkg-$pbver"; … … 612 614 my ($vmexist,$vmpid) = pb_launchvm($v,0); 613 615 616 # Skip that VM if it something went wrong 617 next if (($vmpid == 0) && ($vmexist ==0)); 618 614 619 # Gather all required files to send them to the VM 615 620 # and launch the build thourgh pbscript … … 678 683 } 679 684 if (! -f "$vmm") { 680 die "Unable to find VM $vmm"; 681 } 682 pb_system("$cmd &","Launching the VM $vmm"); 683 pb_system("sleep $vmtmout->{$ENV{'PBPROJ'}}","Waiting for VM $vm to come up"); 684 $vmpid = pb_check_ps($tmpcmd,$vmm); 685 print "Unable to find VM $vmm\n"; 686 } else { 687 pb_system("$cmd &","Launching the VM $vmm"); 688 pb_system("sleep $vmtmout->{$ENV{'PBPROJ'}}","Waiting for VM $vm to come up"); 689 $vmpid = pb_check_ps($tmpcmd,$vmm); 690 } 685 691 } else { 686 692 print "Found an existing VM $vmm (pid $vmexist)\n"; … … 730 736 my ($vmexist,$vmpid) = pb_launchvm($v,0); 731 737 738 # Skip that VM if it something went wrong 739 next if (($vmpid == 0) && ($vmexist == 0)); 740 732 741 # Gather all required files to send them to the VM 733 742 # and launch the build thourgh pbscript … … 795 804 if ((not defined $ENV{'PBVM'}) || ($ENV{'PBVM'} =~ /^all$/)) { 796 805 my ($ptr) = pb_conf_get("vmlist"); 797 $ENV{'PBVM'} = $ptr->{$ENV{'PBPROJ'}}; 806 my $ptr2 = $ptr->{$ENV{'PBPROJ'}}; 807 $ptr2 =~ s/,/_64,/g; 808 $ptr2 =~ s/$/_64/g; 809 $ENV{'PBVM'} = "$ptr->{$ENV{'PBPROJ'}},$ptr2"; 798 810 $all = 1; 799 811 } 812 print $LOG "VMs: $ENV{'PBVM'}\n"; 800 813 @vm = split(/,/,$ENV{'PBVM'}); 801 print $LOG "VMs: ".join(',',@vm)."\n";802 814 return(\@vm,$all); 803 815 }
Note:
See TracChangeset
for help on using the changeset viewer.