Changeset 203 in ProjectBuilder for devel/pb/bin/pb

Timestamp:

Oct 14, 2007, 7:41:38 PM (17 years ago)

Author:

Bruno Cornec

Message:

use make and not the macro not portable
document Ubuntu 6.06 distribution detection hack
fix some VMs handling pb

File:

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

devel/pb/bin/pb

@@ -455 +455 @@
     my $dir = shift || "sshdir";
     my $port = shift || "sshport";
-    my $tmout = shift || "120";
+    my $tmout = shift || "vmtmout";
     my $cmd = "";
 
@@ -516 +516 @@
 
     print $LOG "Sources handled ($cmt): $src\n" if ($debug >= 0);
-    my ($sshhost,$sshlogin,$sshdir,$sshport) = pb_conf_get($host,$login,$dir,$port);
+    my ($sshhost,$sshlogin,$sshdir,$sshport,$vmtmout) = pb_conf_get($host,$login,$dir,$port,$tmout);
     my $mac = "$sshlogin->{$ENV{'PBPROJ'}}\@$sshhost->{$ENV{'PBPROJ'}}";
     # Overwrite account value if passed as parameter
@@ -539 +539 @@
 
     $port = $sshport->{$ENV{'PBPROJ'}};
-    my $tm = $tmout->{$ENV{'PBPROJ'}};
+    my $tm = $vmtmout->{$ENV{'PBPROJ'}};
     pb_system("ssh -q -p $port $mac \"mkdir -p $tdir ; cd $tdir ; echo \'for i in $basesrc; do if [ -f \$i ]; then rm -f \$i; fi; done\ ; $cmd' | bash\"","Preparing $tdir on $mac");
     pb_system("cd $ENV{'PBBUILDDIR'} ; scp -p -P $port $src $mac:$tdir 2> /dev/null","$cmt delivery in $tdir on $mac");