From 4e9d45ed9256b65b4297a02472f91061d596f580 Mon Sep 17 00:00:00 2001
From: abdullahtahiriyo <abdullahtahiriyo@users.noreply.github.com>
Date: Thu, 2 May 2019 17:55:03 +0200
Subject: [PATCH] Travis: Move building to external batch script (#2131)

* Travis: Move building to external batch script

* Travis: double quotes to escape route

* Travis: use cmd.exe to call batch file
---
 .travis.yml       | 3 +--
 .travis/build.bat | 6 ++++++
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .travis/build.bat

diff --git a/.travis.yml b/.travis.yml
index b6a4a15353..f007383b23 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -73,7 +73,6 @@ matrix:
           - GENERATOR="Visual Studio 15 2017 Win64"
           - PYTHON_MAJOR_VERSION=3        
           - MSBUILD_PATH="c:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin"
-          - CL_PATH=""
           - TEST_PATH="C:\Users\travis\build\FreeCAD\FreeCAD\build\bin"
           - CLCACHE_PATH="C:\Users\travis\build\FreeCAD\FreeCAD\"
           - VS15=true
@@ -274,7 +273,7 @@ script:
     if [ "${TRAVIS_OS_NAME}" == "windows" ]; then
         # call msbuild using clcache 
         #cmd.exe /C '"C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" amd64 && MSBuild.exe FreeCAD_Trunk.sln /p:CLToolExe=clcache.exe /p:TrackFileAccess=false /p:CLToolPath=C:\Users\travis\build\FreeCAD\FreeCAD /m:2 /nologo /verbosity:minimal /p:Configuration=Release /p:Platform=x64'
-        cmd.exe /C '"C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" amd64 & MSBuild.exe FreeCAD_Trunk.sln /p:CLToolExe=clcache.exe /p:TrackFileAccess=false /p:CLToolPath=C:\Users\travis\build\FreeCAD\FreeCAD /m:2 /nologo /verbosity:minimal /p:Configuration=Release /p:Platform=x64'
+        cmd.exe /C 'C:\Users\travis\build\FreeCAD\FreeCAD\.travis\build.bat'
         # ls -lahR
         cp -a ../FreeCADLibs/bin/* bin/
         # show clcache hit stats
diff --git a/.travis/build.bat b/.travis/build.bat
new file mode 100644
index 0000000000..33d0b4287e
--- /dev/null
+++ b/.travis/build.bat
@@ -0,0 +1,6 @@
+echo on
+
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" amd64 
+
+MSBuild.exe FreeCAD_Trunk.sln /p:CLToolExe=clcache.exe /p:TrackFileAccess=false /p:CLToolPath=C:\Users\travis\build\FreeCAD\FreeCAD /m:2 /nologo /verbosity:minimal /p:Configuration=Release /p:Platform=x64
+