Mercurial > hg > sonic-visualiser

comparison deploy/win64/build-and-package.bat @ 1841:9f26f92bf89f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 a594146c1ed8
comparison
equal deleted inserted replaced
1839:fdcd956b5d32 1841:9f26f92bf89f
2 2
3 set STARTPWD=%CD% 3 set STARTPWD=%CD%
4 4
5 if not exist "C:\Program Files (x86)\SMLNJ\bin" ( 5 if not exist "C:\Program Files (x86)\SMLNJ\bin" (
6 @ echo Could not find SML/NJ, required for Repoint 6 @ echo Could not find SML/NJ, required for Repoint
7 @ exit /b 7 @ exit /b 2
8 ) 8 )
9 9
10 if not exist "C:\Program Files (x86)\WiX Toolset v3.11\bin" ( 10 if not exist "C:\Program Files (x86)\WiX Toolset v3.11\bin" (
11 @ echo Could not find WiX Toolset 11 @ echo Could not find WiX Toolset
12 @ exit /b 12 @ exit /b 2
13 ) 13 )
14 14
15 @echo Rebuilding 32-bit 15 @echo Rebuilding 32-bit
16 16
17 cd %STARTPWD% 17 cd %STARTPWD%
18 rem del /q /s build_win32 18 del /q /s build_win32
19 call .\deploy\win64\build-32.bat 19 call .\deploy\win64\build-32.bat
20 if %errorlevel% neq 0 exit /b %errorlevel% 20 if %errorlevel% neq 0 exit /b %errorlevel%
21 21
22 @echo Rebuilding 64-bit 22 @echo Rebuilding 64-bit
23 23
24 cd %STARTPWD% 24 cd %STARTPWD%
25 rem del /q /s build_win64 25 del /q /s build_win64
26 call .\deploy\win64\build-64.bat 26 call .\deploy\win64\build-64.bat
27 if %errorlevel% neq 0 exit /b %errorlevel% 27 if %errorlevel% neq 0 exit /b %errorlevel%
28 28
29 set PATH=%PATH%;"C:\Program Files (x86)\WiX Toolset v3.11\bin" 29 set PATH=%PATH%;"C:\Program Files (x86)\WiX Toolset v3.11\bin"
30 30