From f3ff731794d9c539c222e8606b5336752c6e3cf9 Mon Sep 17 00:00:00 2001
From: David Brown <dave.github@brownsmeet.com>
Date: Wed, 7 Dec 2016 17:18:00 +0000
Subject: [PATCH] Working on autobuild.

---
 src/tools/autobuild/build-oberon.sh |  5 +++--
 src/tools/autobuild/buildall.pl     | 28 ++++++++++++++--------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/tools/autobuild/build-oberon.sh b/src/tools/autobuild/build-oberon.sh
index a2925bbc..7dc5096a 100644
--- a/src/tools/autobuild/build-oberon.sh
+++ b/src/tools/autobuild/build-oberon.sh
@@ -5,11 +5,12 @@
 # $1 - whether to use sudo
 # $2 - build directory
 # $3 - CC
+# $4 - branch
 
 if test "$1" = "sudo"; then sudo=sudo; else sudo=""; fi
 
 echo ""
-echo === build-oberon.sh: \$1="$1", \$2="$2", \$3="$3", \$sudo="$sudo" ===
+echo === build-oberon.sh: \$1="$1", \$2="$2", \$3="$3", \$4="$4", \$sudo="$sudo" ===
 echo ""
 
 set -x
@@ -18,7 +19,7 @@ cd $2
 $sudo git reset --hard    # Clear the staging area
 $sudo git clean -dfx      # Remove all untracked files
 $sudo git pull            # Update the local repository
-$sudo git checkout -f $1  # Switch to requested branch
+$sudo git checkout -f $4  # Switch to requested branch
 
 export CC=$3
 $sudo make full
\ No newline at end of file
diff --git a/src/tools/autobuild/buildall.pl b/src/tools/autobuild/buildall.pl
index f14b07ca..417fc07c 100644
--- a/src/tools/autobuild/buildall.pl
+++ b/src/tools/autobuild/buildall.pl
@@ -10,20 +10,20 @@ my $branch = "master";
 if (defined($ARGV[0]) && ($ARGV[0] ne "")) {$branch = $ARGV[0]}
 
 my %machines = (
-  "pi"       => ['22',   'pi@pie',                          'sh build-oberon.sh  sudo  projects/oberon/vishap/voc  gcc'],
-  "darwin"   => ['22',   'dave@dcb',                        'sh build-oberon.sh  sudo  projects/oberon/vishap/voc  clang'],
-  "cygwin32" => ['5932', 'dave@wax',                        'sh build-oberon.sh  n     oberon/cygwin/voc           gcc'],
-  "cygwin64" => ['5932', 'dave@wax',        'sh start64.sh \'sh build-oberon.sh  n     oberon/cygwin/voc           gcc\''],
-  "mingw32"  => ['5932', 'dave@wax',                        'sh build-oberon.sh  n     oberon/mingw/voc            i686-w64-mingw32-gcc'],
-  "mingw64"  => ['5932', 'dave@wax',        'sh start64.sh \'sh build-oberon.sh  n     oberon/mingw/voc            i686-w64-mingw32-gcc\''],
-  "android"  => ['8022', 'root@and',                        'sh build-oberon.sh  n     vishap/voc                  gcc'],
-  "lub64"    => ['22',   'dave@vim',                        'sh build-oberon.sh  sudo  oberon/voc                  gcc'],
-  "lub32"    => ['22',   'dave@vim-lub32',                  'sh build-oberon.sh  sudo  oberon/voc                  gcc'],
-  "fed64"    => ['22',   'dave@vim-fed64',                  'sh build-oberon.sh  sudo  oberon/voc                  gcc'],
-  "osu64"    => ['22',   'dave@vim-osu64',                  'sh build-oberon.sh  sudo  oberon/voc                  gcc'],
-  "ob32"     => ['22',   'root@nas-ob32',                   'sh build-oberon.sh  n     vishap/voc                  gcc'],
-  "ce64"     => ['5922', 'obe@www',                         'sh build-oberon.sh  sudo  vishap/voc                  gcc'],
-  "fb64"     => ['22',   'root@oberon',                     'sh build-oberon.sh  n     vishap/voc                  gcc']
+  "pi"       => ['22',   'pi@pie',                          'sh build-oberon.sh  sudo  projects/oberon/vishap/voc  gcc                  $branch'],
+  "darwin"   => ['22',   'dave@dcb',                        'sh build-oberon.sh  sudo  projects/oberon/vishap/voc  clang                $branch'],
+  "cygwin32" => ['5932', 'dave@wax',                        'sh build-oberon.sh  n     oberon/cygwin/voc           gcc                  $branch'],
+  "cygwin64" => ['5932', 'dave@wax',        'sh start64.sh \'sh build-oberon.sh  n     oberon/cygwin/voc           gcc                  $branch\''],
+  "mingw32"  => ['5932', 'dave@wax',                        'sh build-oberon.sh  n     oberon/mingw/voc            i686-w64-mingw32-gcc $branch'],
+  "mingw64"  => ['5932', 'dave@wax',        'sh start64.sh \'sh build-oberon.sh  n     oberon/mingw/voc            i686-w64-mingw32-gcc $branch\''],
+  "android"  => ['8022', 'root@and',                        'sh build-oberon.sh  n     vishap/voc                  gcc                  $branch'],
+  "lub64"    => ['22',   'dave@vim',                        'sh build-oberon.sh  sudo  oberon/voc                  gcc                  $branch'],
+  "lub32"    => ['22',   'dave@vim-lub32',                  'sh build-oberon.sh  sudo  oberon/voc                  gcc                  $branch'],
+  "fed64"    => ['22',   'dave@vim-fed64',                  'sh build-oberon.sh  sudo  oberon/voc                  gcc                  $branch'],
+  "osu64"    => ['22',   'dave@vim-osu64',                  'sh build-oberon.sh  sudo  oberon/voc                  gcc                  $branch'],
+  "ob32"     => ['22',   'root@nas-ob32',                   'sh build-oberon.sh  n     vishap/voc                  gcc                  $branch'],
+  "ce64"     => ['5922', 'obe@www',                         'sh build-oberon.sh  sudo  vishap/voc                  gcc                  $branch'],
+  "fb64"     => ['22',   'root@oberon',                     'sh build-oberon.sh  n     vishap/voc                  gcc                  $branch']
 );