# HG changeset patch
# User Chris Cannam
# Date 1544368956 0
# Node ID c80a1dac9fda4725fdf053a072056383797d9ad3
# Parent  9e31ab5d93941e1109a78adcb0c185b036f7b1e0
Copy in various further dependencies

diff -r 9e31ab5d9394 -r c80a1dac9fda deploy/win32/build-and-package.bat
--- a/deploy/win32/build-and-package.bat	Fri Dec 07 17:39:12 2018 +0000
+++ b/deploy/win32/build-and-package.bat	Sun Dec 09 15:22:36 2018 +0000
@@ -1,5 +1,7 @@
 rem  Run this from within the top-level project dir: deploy\win32\build.bat
 
+rem  NB PyQt5 build command, in PyQt5_gpl-5.11.3 directory: c:\Python27\python.exe configure.py --qmake=c:\qt\5.12.0\msvc2017\bin\qmake.exe --sip=c:\Python27\sip.exe --disable=QtNfc
+
 set STARTPWD=%CD%
 
 if not exist "C:\Program Files (x86)\WiX Toolset v3.11\bin" (
@@ -8,13 +10,25 @@
 )
 
 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%
+@   echo Could not find Windows CRT directory
+@   exit /b 2
+)
+
+if not exist "C:/Python27/Lib/site-packages/PyQt5/" (
+@   echo Could not find PyQt5 directory
+@   exit /b 2
+)
+
+if not exist "C:/Python27/Lib/site-packages/Crypto/" (
+@   echo Could not find PyCrypto directory
 @   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 PYQTDIR=C:/Python27/Lib/site-packages/PyQt5/
+set PYCRYPTODIR=C:/Python27/Lib/site-packages/Crypto/
 set NAME=Open Source Developer, Christopher Cannam
 
 set ARG=%1
@@ -44,6 +58,8 @@
 
 cd build_win32\release
 
+copy "%STARTPWD%\easyhg.py" .
+
 copy "%CRTDIR%\concrt140.DLL" .
 copy "%CRTDIR%\msvcp140.DLL" .
 copy "%CRTDIR%\vccorlib140.DLL" .
@@ -53,12 +69,33 @@
 copy "%HGDIR%\PFiles\Mercurial\python27.dll" .
 
 mkdir lib
-copy "%HGDIR%\PFiles\Mercurial\lib\*" .\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" .
 
+mkdir PyQt5
+copy "%PYQTDIR%\..\sip.pyd" .
+copy "%PYQTDIR%\__init__.py" PyQt5\
+copy "%PYQTDIR%\QtCore.pyd" PyQt5\
+copy "%PYQTDIR%\QtGui.pyd" PyQt5\
+copy "%PYQTDIR%\QtWidgets.pyd" PyQt5\
+
+mkdir Crypto
+mkdir Crypto\Cipher
+mkdir Crypto\Util
+
+copy "%PYCRYPTODIR%\Cipher\__init__.py" Crypto\Cipher\
+copy "%PYCRYPTODIR%\Cipher\_AES.pyd" Crypto\Cipher\
+copy "%PYCRYPTODIR%\Cipher\AES.py" Crypto\Cipher\
+copy "%PYCRYPTODIR%\Cipher\blockalgo.py" Crypto\Cipher\
+
+copy "%PYCRYPTODIR%\Util\__init__.py" Crypto\Util\
+copy "%PYCRYPTODIR%\Util\py3compat.py" Crypto\Util\
+
+copy "%PYCRYPTODIR%\__init__.py" Crypto\
+
 if "%ARG%" == "sign" (
 @echo Signing components
 signtool sign /v /n "%NAME%" /t http://time.certum.pl /fd sha1 *.dll *.exe lib\*