diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-03-10 13:39:10 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-03-16 17:14:20 +0100 |
commit | 3c3802fbc026010a00c235aab9a548b7cafbe2ad (patch) | |
tree | 77b6d0df2bce58315cdfc34df9403a8900b39288 /build_scripts | |
parent | 3521dfcee8a800927aaf024ab2b64b1402e8256b (diff) |
Add an option to disable copying of the Qt tools
Fixes: PYSIDE-1518
Change-Id: Ida9982b9349bb5c34af671a9027aa90e9c87a02a
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'build_scripts')
-rw-r--r-- | build_scripts/main.py | 2 | ||||
-rw-r--r-- | build_scripts/options.py | 5 | ||||
-rw-r--r-- | build_scripts/platforms/unix.py | 35 | ||||
-rw-r--r-- | build_scripts/platforms/windows_desktop.py | 5 |
4 files changed, 29 insertions, 18 deletions
diff --git a/build_scripts/main.py b/build_scripts/main.py index 669a1754c..f1c49dfca 100644 --- a/build_scripts/main.py +++ b/build_scripts/main.py @@ -759,6 +759,8 @@ class PysideBuild(_build, DistUtilsCommandMixin): # Add source location for generating documentation cmake_src_dir = OPTION["QT_SRC"] if OPTION["QT_SRC"] else qt_src_dir cmake_cmd.append(f"-DQT_SRC_DIR={cmake_src_dir}") + if OPTION['NO_QT_TOOLS']: + cmake_cmd.append("-DNO_QT_TOOLS=yes") log.info(f"Qt Source dir: {cmake_src_dir}") if OPTION['AVOID_PROTECTED_HACK']: diff --git a/build_scripts/options.py b/build_scripts/options.py index 862f5eb9a..ec61fe0db 100644 --- a/build_scripts/options.py +++ b/build_scripts/options.py @@ -219,7 +219,8 @@ class DistUtilsCommandMixin(object): ('module-subset=', None, 'Qt modules to be built'), ('rpath=', None, 'RPATH'), ('qt-conf-prefix=', None, 'Qt configuration prefix'), - ('qt-src-dir=', None, 'Qt source directory')] + ('qt-src-dir=', None, 'Qt source directory'), + ('no-qt-tools', None, 'Do not copy the Qt tools')] def __init__(self): self.avoid_protected_hack = False @@ -256,6 +257,7 @@ class DistUtilsCommandMixin(object): self.rpath = None self.qt_conf_prefix = None self.qt_src_dir = None + self.no_qt_tools = False def mixin_finalize_options(self): # Bail out on 2nd call to mixin_finalize_options() since that is the @@ -306,6 +308,7 @@ class DistUtilsCommandMixin(object): OPTION['RPATH_VALUES'] = self.rpath OPTION['QT_CONF_PREFIX'] = self.qt_conf_prefix OPTION['QT_SRC'] = self.qt_src_dir + OPTION['NO_QT_TOOLS'] = self.no_qt_tools def _determine_defaults_and_check(self): if not self.cmake: diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py index 6e2785be0..6698cdc13 100644 --- a/build_scripts/platforms/unix.py +++ b/build_scripts/platforms/unix.py @@ -132,26 +132,29 @@ def prepare_packages_posix(self, vars): executables.extend(copydir( "{install_dir}/bin/", "{st_build_dir}/{st_package_name}", - filter=[ - f"{PYSIDE}-lupdate", - "uic", - "rcc", - ], + filter=[f"{PYSIDE}-lupdate"], recursive=False, vars=vars)) - # Copying designer - if sys.platform == "darwin": - executables.extend(copydir( - "{install_dir}/bin/Designer.app", - "{st_build_dir}/{st_package_name}/Designer.app", - filter=None, recursive=True, - force=False, vars=vars)) - else: + if not OPTION['NO_QT_TOOLS']: executables.extend(copydir( "{install_dir}/bin/", - "{st_build_dir}/{st_package_name}/", - filter=["designer"], - force=False, vars=vars)) + "{st_build_dir}/{st_package_name}", + filter=["uic", "rcc"], + recursive=False, vars=vars)) + + # Copying designer + if sys.platform == "darwin": + executables.extend(copydir( + "{install_dir}/bin/Designer.app", + "{st_build_dir}/{st_package_name}/Designer.app", + filter=None, recursive=True, + force=False, vars=vars)) + else: + executables.extend(copydir( + "{install_dir}/bin/", + "{st_build_dir}/{st_package_name}/", + filter=["designer"], + force=False, vars=vars)) # <install>/lib/lib* -> {st_package_name}/ copydir( diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py index 8786f138c..b76f5d1b8 100644 --- a/build_scripts/platforms/windows_desktop.py +++ b/build_scripts/platforms/windows_desktop.py @@ -158,10 +158,13 @@ def prepare_packages_win32(self, vars): force=False, vars=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"]) copydir( "{install_dir}/bin/", "{st_build_dir}/{st_package_name}", - filter=["pyside*.exe", "pyside*.dll", "uic.exe", "rcc.exe", "designer.exe"], + filter=filters, recursive=False, vars=vars) # <install>/lib/*.lib -> {st_package_name}/ |