Merge pull request #626 from stonebig/master

stonebig · web-flow · commit e62c503111fd · 2018-04-29T00:03:07.000+02:00
PySide2-5.11.0a1 (+ Qtdesigner) compatibility
diff --git a/make.py b/make.py
@@ -629,6 +629,44 @@ def _create_batch_scripts_initial(self):
 
 :ffmpeg_bad
 
+
+rem ******************
+rem handle PySide2 if included
+rem ******************
+set tmp_pyz=%WINPYDIR%\Lib\site-packages\PySide2
+if not exist "%tmp_pyz%" goto pyside2_conf_exist
+set tmp_pyz=%tmp_pyz%\qt.conf
+if  exist "%tmp_pyz%" goto pyside2_conf_exist
+echo [Paths]>>"%tmp_pyz%"
+echo Prefix = .>>"%tmp_pyz%"
+echo Binaries = .>>"%tmp_pyz%"
+:pyside2_conf_exist
+
+rem ******************
+rem handle PyQt5 if included
+rem ******************
+set tmp_pyz=%WINPYDIR%\Lib\site-packages\PyQt5
+if not exist "%tmp_pyz%" goto pyqt5_conf_exist
+set tmp_pyz=%tmp_pyz%\qt.conf
+if  exist "%tmp_pyz%" goto pyqt5_conf_exist
+echo [Paths]>>"%tmp_pyz%"
+echo Prefix = .>>"%tmp_pyz%"
+echo Binaries = .>>"%tmp_pyz%"
+:pyqt5_conf_exist
+
+rem ******************
+rem handle PyQt4 if included
+rem ******************
+set tmp_pyz=%WINPYDIR%\Lib\site-packages\PyQt4
+if not exist "%tmp_pyz%" goto pyqt4_conf_exist
+set tmp_pyz=%tmp_pyz%\qt.conf
+if  exist "%tmp_pyz%" goto pyqt4_conf_exist
+echo [Paths]>>"%tmp_pyz%"
+echo Prefix = .>>"%tmp_pyz%"
+echo Binaries = .>>"%tmp_pyz%"
+:pyqt4_conf_exist
+
+
 rem ******************
 rem WinPython.ini part (removed from nsis)
 rem ******************
@@ -710,6 +748,47 @@ def _create_batch_scripts_initial(self):
     $env:IMAGEIO_FFMPEG_EXE = "%WINPYDIRBASE%\t\ffmpeg.exe"
 }
 
+#####################
+### handle PySide2 if included
+#####################
+
+$env:tmp_pyz = "$env:WINPYDIR\Lib\site-packages\PySide2"
+if (Test-Path "$env:tmp_pyz") {
+   $env:tmp_pyz = "$env:tmp_pyz\qt.conf"
+   if (-not (Test-Path "$env:tmp_pyz")) {
+      "[Paths]"| Add-Content -Path $env:tmp_pyz
+      "Prefix = ."| Add-Content -Path $env:tmp_pyz
+      "Binaries = ."| Add-Content -Path $env:tmp_pyz
+   }
+}
+
+#####################
+### handle PyQt5 if included
+#####################
+$env:tmp_pyz = "$env:WINPYDIR\Lib\site-packages\PyQt5"
+if (Test-Path "$env:tmp_pyz") {
+   $env:tmp_pyz = "$env:tmp_pyz\qt.conf"
+   if (-not (Test-Path "$env:tmp_pyz")) {
+      "[Paths]"| Add-Content -Path $env:tmp_pyz
+      "Prefix = ."| Add-Content -Path $env:tmp_pyz
+      "Binaries = ."| Add-Content -Path $env:tmp_pyz
+   }
+}
+
+#####################
+### handle PyQt4 if included
+#####################
+$env:tmp_pyz = "$env:WINPYDIR\Lib\site-packages\PyQt4"
+if (Test-Path "$env:tmp_pyz") {
+   $env:tmp_pyz = "$env:tmp_pyz\qt.conf"
+   if (-not (Test-Path "$env:tmp_pyz")) {
+      "[Paths]"| Add-Content -Path $env:tmp_pyz
+      "Prefix = ."| Add-Content -Path $env:tmp_pyz
+      "Binaries = ."| Add-Content -Path $env:tmp_pyz
+   }
+}
+
+
 #####################
 ### WinPython.ini part (removed from nsis)
 #####################
@@ -1050,8 +1129,10 @@ def _create_batch_scripts(self):
     ) else (
         "%WINPYDIR%\Lib\site-packages\PyQt5\designer.exe" %*
     )
-) else (
+) else if exist "%WINPYDIR%\Lib\site-packages\pyqt4\designer.exe" (
     "%WINPYDIR%\Lib\site-packages\PyQt4\designer.exe" %*
+) else (
+    "%WINPYDIR%\Lib\site-packages\PySide2\designer.exe" %*
 )
 """)
 
diff --git a/winpython/wppm.py b/winpython/wppm.py
@@ -539,7 +539,7 @@ def create_pybat(self, names='', contents=r"""@echo off
 
     def handle_specific_packages(self, package):
         """Packages requiring additional configuration"""
-        if package.name.lower() in ('pyqt4', 'pyqt5'):
+        if package.name.lower() in ('pyqt4', 'pyqt5', 'pyside2'):
             # Qt configuration file (where to find Qt)
             name = 'qt.conf'
             contents = """[Paths]
