diff --git a/src/tools/make/buildall.pl b/src/tools/make/buildall.pl index 512e32d5..939888ff 100755 --- a/src/tools/make/buildall.pl +++ b/src/tools/make/buildall.pl @@ -10,7 +10,11 @@ my %machines = ( "pi" => ['pi@pie', "sudo", "projects/oberon/vishap/voc", "make full"], "darwin" => ['dave@dcb', "sudo", "projects/oberon/vishap/voc", "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 ~;" + . "sh start64.sh \"cd vishaps/voc && git checkout $branch && git pull\";"], + . "sh start64.sh \"cd vishaps/voc && make full\";" + . "sh start64.sh \"cd vishaps/voc && export CC=x86_64-w64-mingw32-gcc && make full\""], "android" => ['-p8022 root@and', "", "vishap/voc", "export CC=gcc && make full"], "lub32" => ['dave@lub32', "sudo", "vishap/voc", "make full"], "ob32" => ['root@nas-ob32', "", "vishap/voc", "make full"], diff --git a/src/tools/make/postpush.pl b/src/tools/make/postpush.pl index cbf82ca9..60636a8c 100755 --- a/src/tools/make/postpush.pl +++ b/src/tools/make/postpush.pl @@ -43,9 +43,9 @@ if ($buildneeded) { writelog "Started buildall, pid = $child."; # parent process } else { close(STDIN); close(STDOUT); close(STDERR); # child process - unlink "buildall.pl"; - sleep 5; # Leave time for the push to complete. (Yuk!) - system 'wget https://raw.githubusercontent.com/vishaps/voc/master/src/tools/make/buildall.pl'; + # unlink "buildall.pl"; + sleep 10; # Leave time for github to have the new version ready. (Yuk!) + system 'curl https://raw.githubusercontent.com/vishaps/voc/master/src/tools/make/buildall.pl >buildall.pl'; exec 'perl buildall.pl >/tmp/buildall.log'; exit; }