Add hard reset and clean to buildall script.

This commit is contained in:
David Brown 2016-10-11 12:22:07 +01:00
parent fb3753c55d
commit 1ef199dd93

View file

@ -6,6 +6,7 @@ use Cwd;
my $branch = "master"; my $branch = "master";
if (defined($ARGV[0]) && ($ARGV[0] ne "")) {$branch = $ARGV[0]} if (defined($ARGV[0]) && ($ARGV[0] ne "")) {$branch = $ARGV[0]}
my %machines = ( my %machines = (
@ -14,7 +15,8 @@ my %machines = (
"wind" => ['-p5932 dave@wax', "", "vishaps/voc", "export CC=gcc && make full;" "wind" => ['-p5932 dave@wax', "", "vishaps/voc", "export CC=gcc && make full;"
. "export CC=i686-w64-mingw32-gcc && make full;" . "export CC=i686-w64-mingw32-gcc && make full;"
. "cd ~;" . "cd ~;"
. "sh start64.sh \\\"cd vishaps/voc && git pull && git checkout $branch && git pull;" . "sh start64.sh \\\"cd vishaps/voc && git reset --hard && git clean -dfx &&"
. "git pull && git checkout $branch && git pull;"
. "export CC=gcc && make full;" . "export CC=gcc && make full;"
. "export CC=x86_64-w64-mingw32-gcc && make full\\\""], . "export CC=x86_64-w64-mingw32-gcc && make full\\\""],
"android" => ['-p8022 root@and', "", "vishap/voc", "export CC=gcc && make full"], "android" => ['-p8022 root@and', "", "vishap/voc", "export CC=gcc && make full"],
@ -55,7 +57,8 @@ unlink glob "log/*";
for my $machine (sort keys %machines) { for my $machine (sort keys %machines) {
my ($login, $sudo, $dir, $mkcmd) = @{$machines{$machine}}; my ($login, $sudo, $dir, $mkcmd) = @{$machines{$machine}};
my $cmd = "ssh $login \"cd $dir && $sudo git pull && $sudo git checkout -f $branch && $sudo git pull && $sudo $mkcmd\" "; my $cmd = "ssh $login \"cd $dir && $sudo git reset --hard && sudo git clean -dfx &&"
. "$sudo git pull && $sudo git checkout -f $branch && $sudo git pull && $sudo $mkcmd\" ";
logged($cmd, $machine); logged($cmd, $machine);
} }