# HG changeset patch
# User Chris Cannam
# Date 1591629292 -3600
# Node ID a2c5ca6b8785f4281ad017d42d560a6c1f081479
# Parent  3a4cb8f27c1062a54889309436c6d9bbcd55f283
More on zipping packages

diff -r 3a4cb8f27c10 -r a2c5ca6b8785 .hgignore
--- a/.hgignore	Mon Jun 08 14:47:59 2020 +0100
+++ b/.hgignore	Mon Jun 08 16:14:52 2020 +0100
@@ -50,3 +50,9 @@
 *.AppDir
 bundle
 bundle.zip
+*.vcxproj
+*.filters
+*.zip
+*.lib
+*.pdb
+*.sln
diff -r 3a4cb8f27c10 -r a2c5ca6b8785 deploy/clean-build-and-package.bat
--- a/deploy/clean-build-and-package.bat	Mon Jun 08 14:47:59 2020 +0100
+++ b/deploy/clean-build-and-package.bat	Mon Jun 08 16:14:52 2020 +0100
@@ -26,7 +26,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-%VERSION%-win32
+set pkg=sonic-annotator-v%VERSION%-win32
 set dir=%pkg%\%pkg%
 mkdir %pkg%
 mkdir %dir%
@@ -41,10 +41,11 @@
 copy build_win32\release\libstdc++-6.dll %dir%\
 copy build_win32\release\libwinpthread-1.dll %dir%\
 copy build_win32\release\sonic-annotator.exe %dir%\
-deploy\win\zip %pkg%.zip %pkg%
+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-%VERSION%-win64
+set pkg=sonic-annotator-v%VERSION%-win64
 set dir=%pkg%\%pkg%
 mkdir %pkg%
 mkdir %dir%
@@ -57,6 +58,7 @@
 copy build_win64\release\Qt5Xml.dll %dir%\
 copy build_win64\release\libsndfile-1.dll %dir%\
 copy build_win64\release\sonic-annotator.exe %dir%\
-deploy\win\zip %pkg%.zip %pkg%
+powershell -NoProfile -ExecutionPolicy Bypass -Command "& 'deploy\win\zip.ps1' %pkg%.zip %pkg%"
+del /q /s %pkg%
 
 @echo Done
diff -r 3a4cb8f27c10 -r a2c5ca6b8785 deploy/win/build-both.bat
--- a/deploy/win/build-both.bat	Mon Jun 08 14:47:59 2020 +0100
+++ b/deploy/win/build-both.bat	Mon Jun 08 16:14:52 2020 +0100
@@ -26,6 +26,7 @@
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 set PATH=%ORIGINALPATH%
+cd %STARTPWD%
 
 @echo Done