# HG changeset patch
# User Chris Cannam
# Date 1544453117 0
# Node ID a74515f1c6e8f0d3fc644ad51e0b8015b5d16be4
# Parent 5b3bcb2d094395f6592fda173cf7395a667f2a4f
Inching forward with win32 packaging
diff -r 5b3bcb2d0943 -r a74515f1c6e8 deploy/win32/build-and-package.bat
--- a/deploy/win32/build-and-package.bat Mon Dec 10 12:03:04 2018 +0000
+++ b/deploy/win32/build-and-package.bat Mon Dec 10 14:45:17 2018 +0000
@@ -1,5 +1,6 @@
rem Run this from within the top-level project dir: deploy\win32\build.bat
+rem NB Sip build command, in sip-4.19.13 directory: c:\Python27\python.exe configure.py --sip-module PyQt5.sip --no-tools
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%
@@ -76,11 +77,12 @@
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\
+copy "%PYQTDIR%\__init__.py" PyQt5\__init__.py
+copy "%PYQTDIR%\Qt.pyd" PyQt5\Qt.pyd
+copy "%PYQTDIR%\QtCore.pyd" PyQt5\QtCore.pyd
+copy "%PYQTDIR%\QtGui.pyd" PyQt5\QtGui.pyd
+copy "%PYQTDIR%\QtWidgets.pyd" PyQt5\QtWidgets.pyd
+copy "%PYQTDIR%\sip.pyd" PyQt5\sip.pyd
mkdir Crypto
mkdir Crypto\Cipher
diff -r 5b3bcb2d0943 -r a74515f1c6e8 deploy/win32/build.bat
--- a/deploy/win32/build.bat Mon Dec 10 12:03:04 2018 +0000
+++ b/deploy/win32/build.bat Mon Dec 10 14:45:17 2018 +0000
@@ -17,7 +17,7 @@
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86
set ORIGINALPATH=%PATH%
-set PATH=%PATH%;C:\Program Files (x86)\SMLNJ\bin;%QTDIR%\bin;C:\Qt\Tools\QtCreator\bin;C:\Qt\Tools\mingw530_32\bin
+set PATH=%PATH%;C:\Program Files (x86)\SMLNJ\bin;%QTDIR%\bin;C:\Qt\Tools\QtCreator\bin
cd %STARTPWD%
diff -r 5b3bcb2d0943 -r a74515f1c6e8 deploy/win32/easyhg.wxs
--- a/deploy/win32/easyhg.wxs Mon Dec 10 12:03:04 2018 +0000
+++ b/deploy/win32/easyhg.wxs Mon Dec 10 14:45:17 2018 +0000
@@ -297,15 +297,38 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
-