Silly me, it's a .sh, not a .pl., temporarily have buildall pick up the new .sh.

This commit is contained in:
David Brown 2016-12-07 14:03:07 +00:00
parent 72ba766a2d
commit bde475c384
3 changed files with 8 additions and 17 deletions

View file

@ -15,12 +15,12 @@ my %machines = (
"cygwin" => ['-p5932 dave@wax', "", "oberon/cygwin/voc", "export CC=gcc && make full;"
. "cd ~;"
. "sh start64.sh \\\"cd oberon/cygwin/voc &&"
. "src/tools/make/getbranch $branch &&"
. "src/tools/make/getbranch.sh $branch &&"
. "export CC=gcc && make full;\\\""],
"mingw" => ['-p5932 dave@wax', "", "oberon/mingw/voc", "export CC=i686-w64-mingw32-gcc && make full;"
. "cd ~;"
. "sh start64.sh \\\"cd oberon/mingw/voc &&"
. "src/tools/make/getbranch $branch &&"
. "src/tools/make/getbranch.sh $branch &&"
. "export CC=x86_64-w64-mingw32-gcc && make full;\\\""],
"android" => ['-p8022 root@and', "", "vishap/voc", "export CC=gcc && make full"],
"lub64" => ['dave@vim', "sudo", "oberon/voc", "make full"],
@ -62,7 +62,7 @@ unlink glob "log/*";
for my $machine (sort keys %machines) {
my ($login, $sudo, $dir, $mkcmd) = @{$machines{$machine}};
my $cmd = "ssh $login \"cd $dir && src/tools/make/getbranch $branch && $sudo $mkcmd\" ";
my $cmd = "ssh $login \"cd $dir && git checkout -f && perl src/tools/make/getbranch.sh $branch && $sudo $mkcmd\" ";
logged($cmd, $machine);
}

View file

@ -1,14 +0,0 @@
#!perl -w
use strict;
use warnings;
# Exit with a clean enlistrment in the named branch.
my $branch = "master";
if (defined($ARGV[0]) && ($ARGV[0] ne "")) {$branch = $ARGV[0]}
set -x
git reset --hard # Clear the staging area
git clean -dfx # Remove all untracked files
git pull # Update the local repository
git checkout -f $branch # Switch to requested branch

View file

@ -0,0 +1,5 @@
set -x
git reset --hard # Clear the staging area
git clean -dfx # Remove all untracked files
git pull # Update the local repository
git checkout -f $1 # Switch to requested branch