Changeset 773 in ProjectBuilder for devel/pb/bin/pb
- Timestamp:
- May 3, 2009, 8:52:30 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb/bin/pb
r772 r773 1145 1145 $src="$src $ENV{'PBDESTDIR'}/pbscript"; 1146 1146 } elsif ($cmt =~ /V[EM]test/) { 1147 $src="$src $ENV{'PB DESTDIR'}/pbtest";1147 $src="$src $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb $ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb $ENV{'PBETC'} $ENV{'PBDESTDIR'}/pbrc $ENV{'PBDESTDIR'}/pbscript $ENV{'PBDESTDIR'}/pbtest"; 1148 1148 } elsif ($cmt eq "Announce") { 1149 1149 $src="$src $ENV{'PBTMP'}/pbscript"; … … 1354 1354 close(PASS); 1355 1355 $cptarget = "$tpdir/$homedir/$tdir"; 1356 if ($cmt eq " ve") {1356 if ($cmt eq "VEbuild") { 1357 1357 $cp2target = "$tpdir/$homedir/$bdir"; 1358 1358 } … … 1468 1468 1469 1469 foreach my $v (@$vm) { 1470 # Launch VM/VE 1471 ($vmexist,$vmpid) = pb_launchv($vtype,$v,0,$snapme );1470 # Launch VM/VE - Usage of snapshot disabled 1471 ($vmexist,$vmpid) = pb_launchv($vtype,$v,0,$snapme,0); 1472 1472 1473 1473 if ($vtype eq "vm") { … … 1501 1501 my $create = shift || 0; # By default do not create a VM/VE 1502 1502 my $snapme = shift || 0; # By default do not snap a VM/VE 1503 1504 pb_log(2,"DEBUG: pb_launchv($vtype,$v,$create,$snapme)\n"); 1503 my $usesnap = shift || 1; # By default study the usage of the snapshot feature of VM/VE 1504 1505 # If creation or snapshot creation mode, no snapshot usable 1506 if (($create == 1) || ($snapme == 1)) { 1507 $usesnap = 0; 1508 } 1509 1510 pb_log(2,"DEBUG: pb_launchv($vtype,$v,$create,$snapme,$usesnap)\n"); 1505 1511 die "No VM/VE defined, unable to launch" if (not defined $v); 1506 1512 # Keep only the first VM in case many were given … … 1531 1537 $ENV{'PBVMOPT'} .= " $vmopt->{$ENV{'PBPROJ'}}" if ($ENV{'PBVMOPT'} !~ / $vmopt->{$ENV{'PBPROJ'}}/); 1532 1538 } 1533 # Use snapshot feature when not creating VM 1534 if ($create == 0) { 1539 1540 # Are we allowed to use snapshot feature 1541 if ($usesnap == 1) { 1535 1542 if ((defined $vmsnap->{$v}) && ($vmsnap->{$v} =~ /true/i)) { 1536 1543 $ENV{'PBVMOPT'} .= "-snapshot "; … … 1545 1552 # Configure the monitoring to automize the creation of the 'pb' snapshot 1546 1553 $ENV{'PBVMOPT'} .= "-serial mon:telnet::$vmmonport->{$ENV{'PBPROJ'}},server,nowait "; 1547 # In that case no snapshot needed1554 # In that case no snapshot call needed 1548 1555 $ENV{'PBVMOPT'} =~ s/-snapshot //; 1549 1556 } … … 2048 2055 EOF 2049 2056 2050 # Launch the VM/VE 2051 ($vmexist,$vmpid) = pb_launchv($vtype,$v,0 );2057 # Launch the VM/VE - Usage of snapshot disabled 2058 ($vmexist,$vmpid) = pb_launchv($vtype,$v,0,0,0); 2052 2059 2053 2060 if ($vtype eq "vm") { … … 2338 2345 2339 2346 # Force shutdown of VM/VE 2340 $pbforce = 1;2341 2347 # Force snapshot of VM/VE 2342 pb_script2v($pbscript,$vtype, $pbforce,$v,1);2348 pb_script2v($pbscript,$vtype,1,$v,1); 2343 2349 } 2344 2350 return;
Note:
See TracChangeset
for help on using the changeset viewer.