changeset 692:a74515f1c6e8

Inching forward with win32 packaging

--- 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

--- 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%
 

--- 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 @@
               </Component>
             </Directory>
 
-            <Component
-                Id="sip"
-                Guid="DCCE0979-A0A6-475D-B6CD-3173740593F9">
-              <File
-                  Id="sip"
-                  Name="sip.pyd"
-                  DiskId="1"
-                  Source="sip.pyd" />
-            </Component>
+            <Directory Id="PyQt" Name="PyQt5">
+              <Component
+                  Id="pyqtlibs"
+                  Guid="0fc219f4-1493-402c-b740-50539eeb7762">
+                <File
+                    Id="pyqtinit"
+                    Name="__init__.py"
+                    DiskId="1"
+                    Source="PyQt5\__init__.py"
+                    KeyPath="yes" />
+                <File
+                    Id="pyqtcore"
+                    Name="QtCore.pyd"
+                    DiskId="1"
+                    Source="PyQt5\QtCore.pyd" />
+                <File
+                    Id="pyqtgui"
+                    Name="QtGui.pyd"
+                    DiskId="1"
+                    Source="PyQt5\QtGui.pyd" />
+                <File
+                    Id="pyqtwidgets"
+                    Name="QtWidgets.pyd"
+                    DiskId="1"
+                    Source="PyQt5\QtWidgets.pyd" />
+                <File
+                    Id="sip"
+                    Name="sip.pyd"
+                    DiskId="1"
+                    Source="PyQt5\sip.pyd" />
+              </Component>
+            </Directory>
 
             <Component
                 Id="kdiff3"
@@ -395,9 +418,9 @@
       <ComponentRef Id="VCLIBS90"/>
       <ComponentRef Id="HelperScripts"/>
       <ComponentRef Id="Qt5"/>
+      <ComponentRef Id="pyqtlibs"/>
       <ComponentRef Id="hgexec"/>
       <ComponentRef Id="hglibs"/>
-      <ComponentRef Id="sip"/>
       <ComponentRef Id="crypto"/>
       <ComponentRef Id="cryptocipher"/>
       <ComponentRef Id="cryptoutil"/>