vishapoberon/compiler
1
0
Fork 0
mirror of https://github.com/vishapoberon/compiler.git synced 2026-04-06 20:22:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix quoting of parameters passed through to 64 bit shell.

Browse source
This commit is contained in:
David Brown 2016-07-15 16:58:45 +01:00
parent c7511287bb
commit 347cefc614
2 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/tools/make/buildall.pl
View file

@ -6,15 +6,33 @@ use Cwd;
my $branch = "master"; my $branch = "master";
----
my $mkcmd =
# "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;"
. "make full;"
. "export CC=x86_64-w64-mingw32-gcc && make full\\\"";
my $cmd = "ssh -p5932 dave\@wax \"cd vishaps/voc && git checkout $branch && git pull && $mkcmd\" ";
print $cmd, "\n";
system($cmd);
----
my %machines = ( my %machines = (
"pi" => ['pi@pie', "sudo", "projects/oberon/vishap/voc", "make full"], "pi" => ['pi@pie', "sudo", "projects/oberon/vishap/voc", "make full"],
"darwin" => ['dave@dcb', "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;" "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 checkout $branch && git pull\";" . "sh start64.sh \\\"cd vishaps/voc && git checkout $branch && git pull;"
. "sh start64.sh \"cd vishaps/voc && make full\";" . "make full;"
. "sh start64.sh \"cd vishaps/voc && 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"],
"lub32" => ['dave@lub32', "sudo", "vishap/voc", "make full"], "lub32" => ['dave@lub32', "sudo", "vishap/voc", "make full"],
"ob32" => ['root@nas-ob32', "", "vishap/voc", "make full"], "ob32" => ['root@nas-ob32', "", "vishap/voc", "make full"],

3
src/tools/make/postpush.pl
View file

@ -43,7 +43,8 @@ if ($buildneeded) {
writelog "Started buildall, pid = $child."; # parent process writelog "Started buildall, pid = $child."; # parent process
} else { } else {
close(STDIN); close(STDOUT); close(STDERR); # child process close(STDIN); close(STDOUT); close(STDERR); # child process
system '(cd voc && git pull) >postpush.log'; system 'echo Syncing voc>postpush.log';
system '(cd voc && git pull) >>postpush.log';
exec 'perl voc/src/tools/make/buildall.pl >/tmp/buildall.log'; exec 'perl voc/src/tools/make/buildall.pl >/tmp/buildall.log';
exit; exit;
} }