Merge pull request #1062 from vasole/pyinstaller

[Package] Recover Pyinstaller under windows

package/pyinstaller/pyinstaller.spec

@@ -399,8 +399,11 @@ def cleanup_cache(topdir):
 
 def replace_module(name):
     dest = os.path.join(DISTDIR, script_n[0])
-    if sys.platform.startswith("darwin") and PyInstaller.__version__ >= '6.0.0':
-        target = os.path.join(dest, "special_modules")
+    if PyInstaller.__version__ >= '6.0.0':
+        if sys.platform.startswith("darwin"):
+            target = os.path.join(dest, "special_modules")
+        else:
+            target = os.path.join(dest, "_internal")
         if not os.path.exists(target):
             os.mkdir(target)
         target = os.path.join(target, os.path.basename(name))
@@ -433,8 +436,11 @@ for fname in script_n:
 
 # patch silx
 if SILX:
-    if sys.platform.startswith("darwin") and PyInstaller.__version__ >= '6.0.0':
-        fname_dir = os.path.join(DISTDIR, script_n[0], "special_modules", "silx", "gui","qt")
+    if PyInstaller.__version__ >= '6.0.0':
+        if sys.platform.startswith("darwin"):
+            fname_dir = os.path.join(DISTDIR, script_n[0], "special_modules", "silx", "gui","qt")
+        else:
+            fname_dir = os.path.join(DISTDIR, script_n[0], "_internal", "silx", "gui","qt")
     else:
         fname_dir = os.path.join(DISTDIR, script_n[0], "silx", "gui","qt")
     for name in ["_qt.py", "__init__.py"]:
@@ -465,7 +471,10 @@ if SILX:
 # patch OpenCL
 if OPENCL:
     # pyopencl __init__.py needs to be patched
-    exe_win_dir = os.path.join(DISTDIR, script_n[0])
+    if PyInstaller.__version__ >= '6.0.0':
+        exe_win_dir = os.path.join(DISTDIR, script_n[0], "_internal")
+    else:
+        exe_win_dir = os.path.join(DISTDIR, script_n[0])
     initFile = os.path.join(exe_win_dir, "pyopencl", "__init__.py")
     logger.info("###################################################################")
     logger.info("Patching pyopencl file")