# HG changeset patch
# User Chris Cannam
# Date 1544204352 0
# Node ID 9e31ab5d93941e1109a78adcb0c185b036f7b1e0
# Parent  6bfca8973f793014ca40e7c48ed07c511d90c0f0
Further toward packaging

diff -r 6bfca8973f79 -r 9e31ab5d9394 deploy/win32/build-and-package.bat
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/win32/build-and-package.bat	Fri Dec 07 17:39:12 2018 +0000
@@ -0,0 +1,68 @@
+rem  Run this from within the top-level project dir: deploy\win32\build.bat
+
+set STARTPWD=%CD%
+
+if not exist "C:\Program Files (x86)\WiX Toolset v3.11\bin" (
+@   echo Could not find WiX Toolset
+@   exit /b 2
+)
+
+if not exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.15.26706\x64\Microsoft.VC141.CRT" (
+@   echo Could not find Windows CRT directory %CRTDIR%
+@   exit /b 2
+)
+
+set ORIGINALPATH=%PATH%
+set PATH=C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Bin;%PATH%
+set CRTDIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.15.26706\x64\Microsoft.VC141.CRT
+set NAME=Open Source Developer, Christopher Cannam
+
+set ARG=%1
+shift
+if "%ARG%" == "sign" (
+@   echo NOTE: sign option specified, will attempt to codesign exe and msi
+) else (
+@   echo NOTE: sign option not specified, will not codesign anything
+)
+
+cd %STARTPWD%
+rem del /q /s build_win32
+call .\deploy\win32\build.bat
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+if not exist mercurial-4.8.0-x86.msi (
+     C:\ProgramData\chocolatey\bin\wget https://bitbucket.org/tortoisehg/files/downloads/mercurial-4.8.0-x86.msi
+)
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+if not exist mercurial-4.8.0-x86 (
+     msiexec /a mercurial-4.8.0-x86.msi /qn TARGETDIR=%STARTPWD%\mercurial-4.8.0-x86
+)
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+set HGDIR=%STARTPWD%\mercurial-4.8.0-x86
+
+cd build_win32\release
+
+copy "%CRTDIR%\concrt140.DLL" .
+copy "%CRTDIR%\msvcp140.DLL" .
+copy "%CRTDIR%\vccorlib140.DLL" .
+copy "%CRTDIR%\vcruntime140.DLL" .
+
+copy "%HGDIR%\PFiles\Mercurial\hg.exe" .
+copy "%HGDIR%\PFiles\Mercurial\python27.dll" .
+
+mkdir lib
+copy "%HGDIR%\PFiles\Mercurial\lib\*" .\lib\
+
+copy "%HGDIR%\windows\system32\msvcm90.dll" .
+copy "%HGDIR%\windows\system32\msvcp90.dll" .
+copy "%HGDIR%\windows\system32\msvcr90.dll" .
+
+if "%ARG%" == "sign" (
+@echo Signing components
+signtool sign /v /n "%NAME%" /t http://time.certum.pl /fd sha1 *.dll *.exe lib\*
+signtool verify /pa sonic-visualiser.msi
+)
+
+rem Todo: the rest
diff -r 6bfca8973f79 -r 9e31ab5d9394 deploy/win32/build.bat
--- a/deploy/win32/build.bat	Fri Dec 07 17:38:17 2018 +0000
+++ b/deploy/win32/build.bat	Fri Dec 07 17:39:12 2018 +0000
@@ -61,14 +61,4 @@
 
 cd %STARTPWD%
 
-if not exist mercurial-4.8.0-x86.msi (
-     C:\ProgramData\chocolatey\bin\wget https://bitbucket.org/tortoisehg/files/downloads/mercurial-4.8.0-x86.msi
-)
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-if not exist mercurial-4.8.0-x86 (
-     msiexec /a mercurial-4.8.0-x86.msi /qn TARGETDIR=%STARTPWD%\mercurial-4.8.0-x86
-)
-if %errorlevel% neq 0 exit /b %errorlevel%
-
 set PATH=%ORIGINALPATH%