From ba96669d4ad0c31b8703231a9346218c6b92df70 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Wed, 16 Jun 2021 09:49:21 +0200
Subject: PySide6: Add assistant executable

[ChangeLog][PySide6] Assistant is now shipped along with PySide.

Fixes: PYSIDE-1378
Change-Id: Ie08778964f47378acf4e570b9a6dc3690257e411
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Tismer <tismer@stackless.com>
---
 build_scripts/config.py                    | 1 +
 build_scripts/platforms/linux.py           | 2 ++
 build_scripts/platforms/macos.py           | 1 +
 build_scripts/platforms/unix.py            | 3 ++-
 build_scripts/platforms/windows_desktop.py | 3 ++-
 5 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'build_scripts')

diff --git a/build_scripts/config.py b/build_scripts/config.py
index d3b9a38b1..60e9eccfb 100644
--- a/build_scripts/config.py
+++ b/build_scripts/config.py
@@ -216,6 +216,7 @@ class Config(object):
                 'console_scripts': [
                     f'{PYSIDE}-uic = {package_name}.scripts.pyside_tool:uic',
                     f'{PYSIDE}-rcc = {package_name}.scripts.pyside_tool:rcc',
+                    f'{PYSIDE}-assistant = {package_name}.scripts.pyside_tool:assistant',
                     f'{PYSIDE}-designer= {package_name}.scripts.pyside_tool:designer',
                     f'{PYSIDE}-lupdate = {package_name}.scripts.pyside_tool:main',
                     f'{PYSIDE}-genpyi = {package_name}.scripts.pyside_tool:genpyi',
diff --git a/build_scripts/platforms/linux.py b/build_scripts/platforms/linux.py
index 442506d81..cbd47070d 100644
--- a/build_scripts/platforms/linux.py
+++ b/build_scripts/platforms/linux.py
@@ -90,6 +90,8 @@ def prepare_standalone_package_linux(self, vars):
 
     # Patching designer to use the Qt libraries provided in the wheel
     if config.is_internal_pyside_build():
+        assistant_path = "{st_build_dir}/{st_package_name}/assistant".format(**vars)
+        linux_patch_executable(self._patchelf_path, assistant_path)
         designer_path = "{st_build_dir}/{st_package_name}/designer".format(**vars)
         linux_patch_executable(self._patchelf_path, designer_path)
 
diff --git a/build_scripts/platforms/macos.py b/build_scripts/platforms/macos.py
index 6db0ef2b7..81e826d73 100644
--- a/build_scripts/platforms/macos.py
+++ b/build_scripts/platforms/macos.py
@@ -89,6 +89,7 @@ def prepare_standalone_package_macos(self, vars):
 
     # Patching designer to use the Qt libraries provided in the wheel
     if config.is_internal_pyside_build():
+        _macos_patch_executable('assistant', vars)
         _macos_patch_executable('designer', vars)
 
     # <qt>/lib/* -> <setup>/{st_package_name}/Qt/lib
diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py
index 00f42e73f..47e02a719 100644
--- a/build_scripts/platforms/unix.py
+++ b/build_scripts/platforms/unix.py
@@ -167,7 +167,8 @@ def prepare_packages_posix(self, vars):
                 filter=["uic", "rcc"],
                 recursive=False, vars=vars))
 
-            # Copying designer
+            # Copying assistant/designer
+            executables.extend(_copy_gui_executable('assistant', vars=vars))
             executables.extend(_copy_gui_executable('designer', vars=vars))
 
         # <install>/lib/lib* -> {st_package_name}/
diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py
index b76f5d1b8..6b60aa753 100644
--- a/build_scripts/platforms/windows_desktop.py
+++ b/build_scripts/platforms/windows_desktop.py
@@ -160,7 +160,8 @@ def prepare_packages_win32(self, vars):
         # <install>/bin/*.exe,*.dll -> {st_package_name}/
         filters = ["pyside*.exe", "pyside*.dll"]
         if not OPTION['NO_QT_TOOLS']:
-            filters.extend(["uic.exe", "rcc.exe", "designer.exe"])
+            filters.extend(["uic.exe", "rcc.exe", "assistant.exe",
+                            "designer.exe"])
         copydir(
             "{install_dir}/bin/",
             "{st_build_dir}/{st_package_name}",
-- 
cgit v1.2.3