Merge pull request winpython#1400 from stonebig/master

stonebig · web-flow · commit 30430977a9e6 · 2024-09-15T08:31:51.000+02:00
move Pyqt5_tools config as winpython.ini option
diff --git a/make.py b/make.py
@@ -803,15 +803,6 @@ def _create_batch_scripts_initial(self):
 :pyqt5_conf_exist
 
 
-rem ******************
-rem handle pyqt5_tools if included
-rem ******************
-set tmp_pyz=%WINPYDIR%\Lib\site-packages\pyqt5_tools
-if not exist "%tmp_pyz%" goto end_pyqt5_tools_conf
-set QT_PLUGIN_PATH=%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\plugins
-:end_pyqt5_tools_conf
-
-
 rem ******************
 rem WinPython.ini part (removed from nsis)
 rem ******************
@@ -836,6 +827,7 @@ def _create_batch_scripts_initial(self):
     echo #JULIA_EXE=julia.exe
     echo #JULIA=%%JULIA_HOME%%%%JULIA_EXE%%
     echo #JULIA_PKGDIR=%%WINPYDIRBASE%%\settings\.julia
+    echo #QT_PLUGIN_PATH=%%WINPYDIR%%\Lib\site-packages\pyqt5_tools\Qt\plugins
 )>> "%winpython_ini%"
 
 """,
@@ -933,15 +925,6 @@ def _create_batch_scripts_initial(self):
 }
 
 
-#####################
-### handle pyqt5_tools if included
-#####################
-$env:tmp_pyz = "$env:WINPYDIR\Lib\site-packages\pyqt5_tools"
-if (Test-Path "$env:tmp_pyz") {
-   $env:QT_PLUGIN_PATH = "WINPYDIR\Lib\site-packages\pyqt5_tools\Qt\plugins"
-}
-
-
 #####################
 ### WinPython.ini part (removed from nsis)
 #####################
@@ -966,6 +949,7 @@ def _create_batch_scripts_initial(self):
     "#JULIA_EXE=julia.exe" | Add-Content -Path $env:winpython_ini
     "#JULIA=%%JULIA_HOME%%%%JULIA_EXE%%" | Add-Content -Path $env:winpython_ini
     "#JULIA_PKGDIR=%%WINPYDIRBASE%%\settings\.julia" | Add-Content -Path $env:winpython_ini
+    "#QT_PLUGIN_PATH=%%WINPYDIR%%\Lib\site-packages\pyqt5_tools\Qt\plugins" | Add-Content -Path $env:winpython_ini
 }
 
 
