Changeset 135 in ProjectBuilder
- Timestamp:
- Sep 11, 2007, 1:04:43 AM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
0.7.4/pb/bin/pb
r132 r135 434 434 $tdir = "$sshdir->{$ENV{'PBPROJ'}}/src"; 435 435 } elsif ($cmt eq "VMs") { 436 $tdir = dirname("$sshdir->{$ENV{'PBPROJ'}}") ;436 $tdir = dirname("$sshdir->{$ENV{'PBPROJ'}}")."/delivery"; 437 437 } elsif ($cmt eq "Packages") { 438 438 $tdir = "$sshdir->{$ENV{'PBPROJ'}}/$ddir/$dver"; … … 444 444 445 445 $port = $sshport->{$ENV{'PBPROJ'}}; 446 pb_system("ssh -q -p $port $mac \"mkdir -p $tdir /delivery ; cd $tdir/delivery; rm -f $basesrc\"","Preparing $tdir on $mac");447 pb_system("scp -p -P $port $src $mac:$tdir /delivery","$cmt delivery in $tdir on $mac");448 pb_system("ssh -q -p $port $mac \"echo \'cd $tdir /delivery; if [ -f pbscript ]; then ./pbscript; fi\' | bash\"","Executing pbscript on $mac if needed");446 pb_system("ssh -q -p $port $mac \"mkdir -p $tdir ; cd $tdir ; rm -f $basesrc\"","Preparing $tdir on $mac"); 447 pb_system("scp -p -P $port $src $mac:$tdir","$cmt delivery in $tdir on $mac"); 448 pb_system("ssh -q -p $port $mac \"echo \'cd $tdir ; if [ -f pbscript ]; then ./pbscript; fi\' | bash\"","Executing pbscript on $mac if needed"); 449 449 if ($cmt eq "VMs") { 450 450 # Get back info on pkg produced, compute their name and get them from the VM 451 pb_system("scp -p -P $port $mac:$tdir/ delivery/pbgen-$pbprojver-$pbprojtag $ENV{'PBBUILDDIR'}","Get package names in $tdir on $mac");451 pb_system("scp -p -P $port $mac:$tdir/pbgen-$pbprojver-$pbprojtag $ENV{'PBBUILDDIR'}","Get package names in $tdir on $mac"); 452 452 open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$pbprojver-$pbprojtag") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen-$pbprojver-$pbprojtag"; 453 453 my $src = <KEEP>; … … 456 456 $src =~ s/^ *//; 457 457 $src =~ s/ +/,/g; 458 pb_system("scp -p -P $port $mac:$tdir/ delivery/{$src} $ENV{'PBBUILDDIR'}/$odir/$over","Package recovery of in $tdir from $mac");459 #pb_system("ssh -q -p $port $mac \"rm -rf $tdir ; sido /usr/bin/poweroff\"","VM cleanup and halt on $mac");458 pb_system("scp -p -P $port $mac:$tdir/{$src} $ENV{'PBBUILDDIR'}/$odir/$over","Package recovery of in $tdir from $mac"); 459 #pb_system("ssh -q -p $port $mac \"rm -rf dirname("$sshdir->{$ENV{'PBPROJ'}}"); sudo /usr/bin/poweroff\"","VM cleanup and halt on $mac"); 460 460 pb_send2ssh("Packages","$odir"."_"."$over"); 461 461 pb_rm_rf("$ENV{'PBBUILDDIR'}/$odir");
Note:
See TracChangeset
for help on using the changeset viewer.