diff --git a/src/tools/make/buildall.pl b/src/tools/make/buildall.pl index 939888ff..b2536704 100755 --- a/src/tools/make/buildall.pl +++ b/src/tools/make/buildall.pl @@ -12,7 +12,7 @@ my %machines = ( "wind" => ['-p5932 dave@wax', "", "vishaps/voc", "export CC=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 && 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"], diff --git a/src/tools/make/postpush.pl b/src/tools/make/postpush.pl index 0ef53b72..43a4b548 100755 --- a/src/tools/make/postpush.pl +++ b/src/tools/make/postpush.pl @@ -43,10 +43,8 @@ if ($buildneeded) { writelog "Started buildall, pid = $child."; # parent process } else { close(STDIN); close(STDOUT); close(STDERR); # child process - #sleep 5; # Leave time for github to have the new version ready. (Yuk!) - system 'cd voc && git pull'; - system 'cd ~ && cp voc/src/tools/make/buildall.pl .'; - exec 'perl buildall.pl >/tmp/buildall.log'; + system '(cd voc && git pull) >postpush.log'; + exec 'perl voc/src/tools/make/buildall.pl >/tmp/buildall.log'; exit; } } else {