Include all Qt .exe

Author: altendky

build.py

@@ -43,31 +43,66 @@ def main():
 python-tag = {python_tag}
 plat-name = {plat_name}'''.format(**locals()))
 
-    designer_path = os.path.join(qt_bin_path, 'designer.exe')
-    designer_destination = os.path.join('pyqt5-tools', 'designer')
-    os.makedirs(designer_destination, exist_ok=True)
-    shutil.copy(designer_path, designer_destination)
+    applications = []
+    for file in os.listdir(qt_bin_path):
+        base, ext = os.path.splitext(file)
+        if ext == '.exe':
+            applications.append(file)
+
+    destination = 'pyqt5-tools'
+    os.makedirs(destination, exist_ok=True)
+
+    windeployqt_path = os.path.join(qt_bin_path, 'windeployqt.exe'),
+
+    for file in applications:
+        print("\n\n   - - -   Copying {} and it's dependencies".format(file))
+        file_path = os.path.join(qt_bin_path, file)
+        shutil.copy(file_path, destination)
+
+        windeployqt = subprocess.Popen(
+            [
+                windeployqt_path,
+                os.path.basename(file_path)
+            ],
+            cwd=destination
+        )
+        windeployqt.wait(timeout=15)
+        if windeployqt.returncode != 0:
+            print('\n\nwindeployqt failed with return code {}\n\n'
+                            .format(windeployqt.returncode))
+
+    # application_paths = [
+        # 'assistant.exe',
+        # 'designer.exe',
+        # 'linguist.exe'
+    # ]
+
+
+    # for application in application_paths:
+        # application_path = os.path.join(qt_bin_path, application)
+        # os.makedirs(destination, exist_ok=True)
+        # shutil.copy(application_path, destination)
+
+        # windeployqt = subprocess.Popen(
+            # [
+                # windeployqt_path,
+                # os.path.basename(application)
+            # ],
+            # cwd=destination
+        # )
+        # windeployqt.wait(timeout=15)
+        # if windeployqt.returncode != 0:
+            # raise Exception('windeployqt failed with return code {}'
+                            # .format(winqtdeploy.returncode))
+
     designer_plugin_path = os.path.join('${SYSROOT}', 'pyqt5-install', 'designer', 'pyqt5.dll')
     designer_plugin_path = os.path.expandvars(designer_plugin_path)
-    designer_plugin_destination = os.path.join(designer_destination, 'plugins', 'designer')
+    designer_plugin_destination = os.path.join(destination, 'plugins', 'designer')
     os.makedirs(designer_plugin_destination, exist_ok=True)
     shutil.copy(designer_plugin_path, designer_plugin_destination)
     shutil.copy(os.path.join('..', 'PyQt5_gpl-5.7-designer', 'LICENSE'),
                 os.path.join('pyqt5-tools', 'LICENSE.pyqt5'))
 
-    windeployqt_path = os.path.join(qt_bin_path, 'windeployqt.exe'),
-    windeployqt = subprocess.Popen(
-        [
-            windeployqt_path,
-            os.path.basename(designer_path)
-        ],
-        cwd=designer_destination
-    )
-    windeployqt.wait(timeout=15)
-    if windeployqt.returncode != 0:
-        raise Exception('windeployqt failed with return code {}'
-                        .format(winqtdeploy.returncode))
-
     # Since windeployqt doesn't actually work with --compiler-runtime,
     # copy it ourselves
     plat = {32: 'x86', 64: 'x64'}[bits]
@@ -80,7 +115,7 @@ def main():
         'vcruntime140.dll'
     ]
     for file in redist_files:
-        dest = os.path.join(designer_destination, file)
+        dest = os.path.join(destination, file)
         shutil.copyfile(os.path.join(redist_path, file), dest)
         os.chmod(dest, stat.S_IWRITE)
 

buildinfo.py

@@ -62,7 +62,7 @@
     '.'.join([str(v) for v in version_numbers])
     + status.prerelease_suffix
     # TODO: this is totally cheating, revisit the revision scheme
-    + '9'# prerelease_str
+    + '10'# prerelease_str
 )
 
 directories = [