comparison deploy/win64/build-and-package.bat @ 631:22724d007706 v2.1pre1

Remove 32-bit Windows package for simpler maintenance
author Chris Cannam
date Thu, 10 Oct 2019 14:56:47 +0100
parents 80868290cfd9
children 05d6e9ff35f0
comparison
equal deleted inserted replaced
630:e77c6e2f6453 631:22724d007706
32 ) else ( 32 ) else (
33 @ echo NOTE: sign option not specified, will not codesign anything 33 @ echo NOTE: sign option not specified, will not codesign anything
34 ) 34 )
35 35
36 @echo "" 36 @echo ""
37 @echo Rebuilding 32-bit 37 @echo Rebuilding
38
39 cd %STARTPWD%
40 del /q /s build_win32
41 call .\deploy\win32\build-32.bat
42 if %errorlevel% neq 0 exit /b %errorlevel%
43
44 if "%ARG%" == "sign" (
45 @echo Signing 32-bit executables and libraries
46 signtool sign /v /n "%NAME%" /t http://time.certum.pl /fd sha1 build_win32\release\*.exe build_win32\release\*.dll
47 )
48
49 @echo Rebuilding 64-bit
50 38
51 cd %STARTPWD% 39 cd %STARTPWD%
52 del /q /s build_win64 40 del /q /s build_win64
53 call .\deploy\win64\build-64.bat 41 call .\deploy\win64\build-64.bat
54 if %errorlevel% neq 0 exit /b %errorlevel% 42 if %errorlevel% neq 0 exit /b %errorlevel%
58 signtool sign /v /n "%NAME%" /t http://time.certum.pl /fd sha1 build_win32\release\*.exe build_win64\release\*.dll 46 signtool sign /v /n "%NAME%" /t http://time.certum.pl /fd sha1 build_win32\release\*.exe build_win64\release\*.dll
59 ) 47 )
60 48
61 set PATH=%PATH%;"C:\Program Files (x86)\WiX Toolset v3.11\bin" 49 set PATH=%PATH%;"C:\Program Files (x86)\WiX Toolset v3.11\bin"
62 50
63 @echo Packaging 32-bit 51 @echo Packaging
64
65 cd %STARTPWD%\build_win32
66 del tony.msi
67 candle -v ..\deploy\win32\tony.wxs
68 light -b . -ext WixUIExtension -ext WixUtilExtension -v tony.wixobj
69 if %errorlevel% neq 0 exit /b %errorlevel%
70 del tony.wixobj
71 del tony.wixpdb
72
73 if "%ARG%" == "sign" (
74 @echo Signing 32-bit package
75 signtool sign /v /n "%NAME%" /t http://time.certum.pl /fd sha1 tony.msi
76 signtool verify /pa tony.msi
77 )
78
79 @echo Packaging 64-bit
80 52
81 cd %STARTPWD%\build_win64 53 cd %STARTPWD%\build_win64
82 del tony.msi 54 del tony.msi
83 candle -v ..\deploy\win64\tony.wxs 55 candle -v ..\deploy\win64\tony.wxs
84 light -b . -ext WixUIExtension -ext WixUtilExtension -v tony.wixobj 56 light -b . -ext WixUIExtension -ext WixUtilExtension -v tony.wixobj