# HG changeset patch
# User Chris Cannam
# Date 1528367813 -3600
# Node ID 69b7ee11e9ab80fadb98505ac02cc8b1d158bc97
# Parent  2b09b4dce8c476032c5c7893a4da567cc4092ba5# Parent  9f26f92bf89f35d293cc5e5ee06fe2c88c085ad7
Merge from default branch

diff -r 2b09b4dce8c4 -r 69b7ee11e9ab deploy/win64/build-32.bat
--- a/deploy/win64/build-32.bat	Thu Jun 07 11:12:07 2018 +0100
+++ b/deploy/win64/build-32.bat	Thu Jun 07 11:36:53 2018 +0100
@@ -3,10 +3,10 @@
 
 set STARTPWD=%CD%
 
-set QTDIR=C:\Qt\5.10.1\mingw53_32
+set QTDIR=C:\Qt\5.11.0\mingw53_32
 if not exist %QTDIR% (
 @   echo Could not find 32-bit Qt
-@   exit /b
+@   exit /b 2
 )
 
 set ORIGINALPATH=%PATH%
diff -r 2b09b4dce8c4 -r 69b7ee11e9ab deploy/win64/build-64.bat
--- a/deploy/win64/build-64.bat	Thu Jun 07 11:12:07 2018 +0100
+++ b/deploy/win64/build-64.bat	Thu Jun 07 11:36:53 2018 +0100
@@ -5,15 +5,15 @@
 
 set STARTPWD=%CD%
 
-set QTDIR=C:\Qt\5.10.1\msvc2017_64
+set QTDIR=C:\Qt\5.11.0\msvc2017_64
 if not exist %QTDIR% (
 @   echo Could not find 64-bit Qt
-@   exit /b
+@   exit /b 2
 )
 
 if not exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" (
 @   echo "Could not find MSVC vars batch file"
-@   exit /b
+@   exit /b 2
 )
 
 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
diff -r 2b09b4dce8c4 -r 69b7ee11e9ab deploy/win64/build-and-package.bat
--- a/deploy/win64/build-and-package.bat	Thu Jun 07 11:12:07 2018 +0100
+++ b/deploy/win64/build-and-package.bat	Thu Jun 07 11:36:53 2018 +0100
@@ -4,25 +4,25 @@
 
 if not exist "C:\Program Files (x86)\SMLNJ\bin" (
 @   echo Could not find SML/NJ, required for Repoint
-@   exit /b
+@   exit /b 2
 )
 
 if not exist "C:\Program Files (x86)\WiX Toolset v3.11\bin" (
 @   echo Could not find WiX Toolset
-@   exit /b
+@   exit /b 2
 )
 
 @echo Rebuilding 32-bit
 
 cd %STARTPWD%
-rem del /q /s build_win32
+del /q /s build_win32
 call .\deploy\win64\build-32.bat
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 @echo Rebuilding 64-bit
 
 cd %STARTPWD%
-rem del /q /s build_win64
+del /q /s build_win64
 call .\deploy\win64\build-64.bat
 if %errorlevel% neq 0 exit /b %errorlevel%