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

Merge branch 'master' of https://github.com/vishaps/voc

Browse source
This commit is contained in:
norayr 2016-12-07 19:44:58 +04:00
commit 04760174fb
3 changed files with 8 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,12 +15,12 @@ my %machines = (
"cygwin" => ['-p5932 dave@wax', "", "oberon/cygwin/voc", "export CC=gcc && make full;" "cygwin" => ['-p5932 dave@wax', "", "oberon/cygwin/voc", "export CC=gcc && make full;"
. "cd ~;" . "cd ~;"
. "sh start64.sh \\\"cd oberon/cygwin/voc &&" . "sh start64.sh \\\"cd oberon/cygwin/voc &&"
. "src/tools/make/getbranch $branch &&" . "src/tools/make/getbranch.sh $branch &&"
. "export CC=gcc && make full;\\\""], . "export CC=gcc && make full;\\\""],
"mingw" => ['-p5932 dave@wax', "", "oberon/mingw/voc", "export CC=i686-w64-mingw32-gcc && make full;" "mingw" => ['-p5932 dave@wax', "", "oberon/mingw/voc", "export CC=i686-w64-mingw32-gcc && make full;"
. "cd ~;" . "cd ~;"
. "sh start64.sh \\\"cd oberon/mingw/voc &&" . "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;\\\""], . "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"],
"lub64" => ['dave@vim', "sudo", "oberon/voc", "make full"], "lub64" => ['dave@vim', "sudo", "oberon/voc", "make full"],
@ -62,7 +62,7 @@ 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 && src/tools/make/getbranch $branch && $sudo $mkcmd\" "; my $cmd = "ssh $login \"cd $dir && git pull && git checkout -f && src/tools/make/getbranch.sh $branch && $sudo $mkcmd\" ";
logged($cmd, $machine); logged($cmd, $machine);
} }

14
src/tools/make/getbranch.pl
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

5
src/tools/make/getbranch.sh Normal file
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