Mercurial > hg > sonic-visualiser
changeset 1841:9f26f92bf89f
Update for Qt 5.11; some more error-handling, + ensure clean build in rebuild script
author | Chris Cannam |
---|---|
date | Tue, 05 Jun 2018 16:24:08 +0100 |
parents | fdcd956b5d32 |
children | 69b7ee11e9ab 8c3fa4e61847 |
files | deploy/win64/build-32.bat deploy/win64/build-64.bat deploy/win64/build-and-package.bat |
diffstat | 3 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/deploy/win64/build-32.bat Tue Jun 05 13:32:28 2018 +0100 +++ b/deploy/win64/build-32.bat Tue Jun 05 16:24:08 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%
--- a/deploy/win64/build-64.bat Tue Jun 05 13:32:28 2018 +0100 +++ b/deploy/win64/build-64.bat Tue Jun 05 16:24:08 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
--- a/deploy/win64/build-and-package.bat Tue Jun 05 13:32:28 2018 +0100 +++ b/deploy/win64/build-and-package.bat Tue Jun 05 16:24:08 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%