diff options
| -rw-r--r-- | build_scripts/config.py | 1 | ||||
| -rw-r--r-- | build_scripts/platforms/linux.py | 2 | ||||
| -rw-r--r-- | build_scripts/platforms/macos.py | 1 | ||||
| -rw-r--r-- | build_scripts/platforms/unix.py | 3 | ||||
| -rw-r--r-- | build_scripts/platforms/windows_desktop.py | 3 | ||||
| -rw-r--r-- | sources/pyside-tools/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | sources/pyside-tools/pyside_tool.py | 4 |
7 files changed, 32 insertions, 2 deletions
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}", diff --git a/sources/pyside-tools/CMakeLists.txt b/sources/pyside-tools/CMakeLists.txt index 559c9faa1..8ff6de3a8 100644 --- a/sources/pyside-tools/CMakeLists.txt +++ b/sources/pyside-tools/CMakeLists.txt @@ -15,8 +15,10 @@ if(NOT NO_QT_TOOLS STREQUAL "yes") set(UIC_PATH "${LIBEXEC_PATH}/uic${CMAKE_EXECUTABLE_SUFFIX}") set(RCC_PATH "${LIBEXEC_PATH}/rcc${CMAKE_EXECUTABLE_SUFFIX}") if (APPLE) + set(ASSISTANT_PATH "${TOOLS_PATH}/Assistant.app") set(DESIGNER_PATH "${TOOLS_PATH}/Designer.app") else() + set(ASSISTANT_PATH "${TOOLS_PATH}/assistant${CMAKE_EXECUTABLE_SUFFIX}") set(DESIGNER_PATH "${TOOLS_PATH}/designer${CMAKE_EXECUTABLE_SUFFIX}") endif() @@ -34,6 +36,24 @@ if(NOT NO_QT_TOOLS STREQUAL "yes") GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) + if (EXISTS ${ASSISTANT_PATH}) + if (APPLE) + install(DIRECTORY "${ASSISTANT_PATH}" + DESTINATION bin + FILE_PERMISSIONS + OWNER_EXECUTE OWNER_WRITE OWNER_READ + GROUP_EXECUTE GROUP_READ + WORLD_EXECUTE WORLD_READ) + else() + install(FILES "${ASSISTANT_PATH}" + DESTINATION bin + PERMISSIONS + OWNER_EXECUTE OWNER_WRITE OWNER_READ + GROUP_EXECUTE GROUP_READ + WORLD_EXECUTE WORLD_READ) + endif() + endif() + if (EXISTS ${DESIGNER_PATH}) if (APPLE) install(DIRECTORY "${DESIGNER_PATH}" diff --git a/sources/pyside-tools/pyside_tool.py b/sources/pyside-tools/pyside_tool.py index 6a47d3632..1819a3ffb 100644 --- a/sources/pyside-tools/pyside_tool.py +++ b/sources/pyside-tools/pyside_tool.py @@ -81,6 +81,10 @@ def rcc(): qt_tool_wrapper("rcc", ['-g', 'python'] + sys.argv[1:]) +def assistant(): + qt_tool_wrapper("assistant", sys.argv[1:]) + + def _append_to_path_var(var, value): env_value = os.environ.get(var) if env_value: |