# HG changeset patch
# User Chris Cannam
# Date 1591632762 -3600
# Node ID a1c7e2863a629913144adf4cf40525e705e97a86
# Parent  e09fa9a3686f8c59908221a7ccccee88162010a1
Packaging fixes

diff -r e09fa9a3686f -r a1c7e2863a62 deploy/clean-build-and-package.bat
--- a/deploy/clean-build-and-package.bat	Mon Jun 08 17:12:22 2020 +0100
+++ b/deploy/clean-build-and-package.bat	Mon Jun 08 17:12:42 2020 +0100
@@ -17,6 +17,8 @@
 call .\deploy\win\build-both.bat
 if %errorlevel% neq 0 exit /b %errorlevel%
 
+@echo on
+
 set NAME=Open Source Developer, Christopher Cannam
 
 @echo Signing 32-bit executables and libraries
@@ -26,7 +28,7 @@
 signtool sign /v /n "%NAME%" /t http://time.certum.pl /fd sha1 /a build_win64\release\*.exe build_win64\release\*.dll
 
 @echo Zipping up 32-bit package
-set pkg=sonic-annotator-v%VERSION%-win32
+set pkg=sonic-annotator-%VERSION%-win32
 set dir=%pkg%\%pkg%
 mkdir %pkg%
 mkdir %dir%
@@ -34,18 +36,19 @@
 copy CITATION %dir%\CITATION.txt
 copy COPYING %dir%\COPYING.txt
 copy README.md %dir%\README.txt
-copy build_win32\release\Qt5Core.dll %dir%\
-copy build_win32\release\Qt5Network.dll %dir%\
-copy build_win32\release\Qt5Xml.dll %dir%\
-copy build_win32\release\libgcc_s_dw2-1.dll %dir%\
-copy build_win32\release\libstdc++-6.dll %dir%\
-copy build_win32\release\libwinpthread-1.dll %dir%\
-copy build_win32\release\sonic-annotator.exe %dir%\
+copy build_win32\release\Qt5Core.dll %dir%
+copy build_win32\release\Qt5Network.dll %dir%
+copy build_win32\release\Qt5Xml.dll %dir%
+copy build_win32\release\libgcc_s_dw2-1.dll %dir%
+copy build_win32\release\libstdc++-6.dll %dir%
+copy build_win32\release\libwinpthread-1.dll %dir%
+copy build_win32\release\sonic-annotator.exe %dir%
+
 powershell -NoProfile -ExecutionPolicy Bypass -Command "& 'deploy\win\zip.ps1' %pkg%.zip %pkg%"
 del /q /s %pkg%
 
 @echo Zipping up 64-bit package
-set pkg=sonic-annotator-v%VERSION%-win64
+set pkg=sonic-annotator-%VERSION%-win64
 set dir=%pkg%\%pkg%
 mkdir %pkg%
 mkdir %dir%
@@ -53,11 +56,18 @@
 copy CITATION %dir%\CITATION.txt
 copy COPYING %dir%\COPYING.txt
 copy README.md %dir%\README.txt
-copy build_win64\release\Qt5Core.dll %dir%\
-copy build_win64\release\Qt5Network.dll %dir%\
-copy build_win64\release\Qt5Xml.dll %dir%\
-copy build_win64\release\libsndfile-1.dll %dir%\
-copy build_win64\release\sonic-annotator.exe %dir%\
+copy build_win64\release\Qt5Core.dll %dir%
+copy build_win64\release\Qt5Network.dll %dir%
+copy build_win64\release\Qt5Xml.dll %dir%
+copy build_win64\release\libsndfile-1.dll %dir%
+copy build_win64\release\sonic-annotator.exe %dir%
+
+copy "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.25.28508\x64\Microsoft.VC142.CRT\concrt140.DLL" %dir%
+copy "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.25.28508\x64\Microsoft.VC142.CRT\msvcp140.DLL" %dir%
+copy "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.25.28508\x64\Microsoft.VC142.CRT\vccorlib140.DLL" %dir%
+copy "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.25.28508\x64\Microsoft.VC142.CRT\vcruntime140.DLL" %dir%
+copy "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.25.28508\x64\Microsoft.VC142.CRT\vcruntime140_1.DLL" %dir%
+
 powershell -NoProfile -ExecutionPolicy Bypass -Command "& 'deploy\win\zip.ps1' %pkg%.zip %pkg%"
 del /q /s %pkg%