diff options
| author | Shyamnath Premnadh <shyamnath.premnadh@qt.io> | 2023-04-17 17:03:06 +0200 |
|---|---|---|
| committer | Shyamnath Premnadh <shyamnath.premnadh@qt.io> | 2023-04-18 18:16:20 +0200 |
| commit | a6c176fe8a48b8d5f5b7ffaa50b1bc8ab53321f2 (patch) | |
| tree | c685c34ada4115f2266acc9a319537dbf546e323 /build_scripts/platforms/unix.py | |
| parent | 5ee8cbc57c89c9242f93e58c8972448f817b6437 (diff) | |
Tooling: Simplify adding new tools
- Amends a48de6afbf127831aa46c1c006d777861bbbe9cb
- Simplify the developer doc for adding new tools
- Make build_scripts/__init__.py the primary place to add new tools
for the build process
Pick-to: 6.5
Change-Id: I1e8bd9e069471bf51a186c067773d7fbc2588769
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'build_scripts/platforms/unix.py')
| -rw-r--r-- | build_scripts/platforms/unix.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py index 50a6fadc6..753daf898 100644 --- a/build_scripts/platforms/unix.py +++ b/build_scripts/platforms/unix.py @@ -11,6 +11,7 @@ from ..utils import copydir, copyfile, copy_qt_metatypes, makefile from .. import PYSIDE, SHIBOKEN from .linux import prepare_standalone_package_linux from .macos import prepare_standalone_package_macos +from .. import PYSIDE_UNIX_BIN_TOOLS, PYSIDE_UNIX_LIBEXEC_TOOLS, PYSIDE_UNIX_BUNDLED_TOOLS def _macos_copy_gui_executable(name, _vars=None): @@ -149,15 +150,15 @@ def prepare_packages_posix(pyside_build, _vars, cross_build=False): lib_exec_filters = [] if not OPTION['NO_QT_TOOLS']: - lib_exec_filters.extend(['uic', 'rcc', 'qmltyperegistrar', 'qmlimportscanner']) + lib_exec_filters.extend(PYSIDE_UNIX_LIBEXEC_TOOLS) executables.extend(copydir( "{install_dir}/bin/", destination_dir, - _filter=["lrelease", "lupdate", "qmllint", "qmlformat", "qmlls"], + _filter=PYSIDE_UNIX_BIN_TOOLS, recursive=False, _vars=_vars)) - # Copying assistant/designer - executables.extend(_copy_gui_executable('assistant', _vars=_vars)) - executables.extend(_copy_gui_executable('designer', _vars=_vars)) - executables.extend(_copy_gui_executable('linguist', _vars=_vars)) + + # Copying assistant/designer/linguist + for tool in PYSIDE_UNIX_BUNDLED_TOOLS: + executables.extend(_copy_gui_executable(tool, _vars=_vars)) copy_qt_metatypes(destination_qt_dir, _vars) |