From da14bc6398bfb2acb3846db05b842fec7ea6c352 Mon Sep 17 00:00:00 2001
From: David Brown <dave.github@brownsmeet.com>
Date: Thu, 22 Dec 2016 14:35:11 +0000
Subject: [PATCH] Add Visual C x86 autobuild.

---
 make.cmd                            | 13 +++++++++++++
 src/tools/autobuild/build-oberon.sh |  9 ++++++++-
 src/tools/autobuild/buildall.pl     | 26 +++++++++++++-------------
 3 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/make.cmd b/make.cmd
index 7a42fe50..c2a817dc 100644
--- a/make.cmd
+++ b/make.cmd
@@ -68,9 +68,21 @@ goto :eof
 
 :full
 call :clean          || exit /b
+echo.
+echo.--- Compiler build started ---
+echo.
 call :compiler       || exit /b
+echo.
+echo.--- Compiler build successfull ---
+echo.
 call :browsercmd     || exit /b
+echo.
+echo.--- Library build started ---
+echo.
 call :library        || exit /b
+echo.
+echo.--- Library build successfull ---
+echo.
 call :makeinstalldir || exit /b
 goto :eof
 
@@ -148,6 +160,7 @@ goto :eof
 
 
 :clean
+echo.--- Cleaning branch ... %OS% %COMPILER% %DATAMODEL% ---
 rd /s /q %BUILDDIR% 2>nul
 del /q %OBECOMP% 2>nul
 goto :eof
diff --git a/src/tools/autobuild/build-oberon.sh b/src/tools/autobuild/build-oberon.sh
index 7dc5096a..7a7b913b 100644
--- a/src/tools/autobuild/build-oberon.sh
+++ b/src/tools/autobuild/build-oberon.sh
@@ -22,4 +22,11 @@ $sudo git pull            # Update the local repository
 $sudo git checkout -f $4  # Switch to requested branch
 
 export CC=$3
-$sudo make full
\ No newline at end of file
+
+if test "$3" = "msc-x86"; then
+  cmd /c 'C:\Program Files (x86)\Microsoft Visual C++ Build Tools\vcbuildtools.bat' x86 '&&' cd 'c:\cygwin\home\dave\msc-x86\voc' '&&' make full
+else; if test "$3" = "msc-x64"; then
+  cmd /c 'C:\Program Files (x86)\Microsoft Visual C++ Build Tools\vcbuildtools.bat' x64 '&&' cd 'c:\cygwin\home\dave\msc-x64\voc' '&&' make full
+else
+  $sudo make full
+fi
diff --git a/src/tools/autobuild/buildall.pl b/src/tools/autobuild/buildall.pl
index 787ae16c..b0129ccb 100644
--- a/src/tools/autobuild/buildall.pl
+++ b/src/tools/autobuild/buildall.pl
@@ -8,21 +8,21 @@ 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   '                  . $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 . '\''],
+  "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            x86_64-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],
-  "obs32"    => ['22',   'dave@vim-obs32',                  '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]
+  "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],
+  "obs32"    => ['22',   'dave@vim-obs32',                  'sh build-oberon.sh  n     vishap/voc                  gcc    '                  . $branch],
+  "win32"    => ['22',   'dave@vim-win64',                  'sh build-oberon.sh  n     msc-x86/voc                 msc-x86'                  . $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]
 );
 
 sub logged {