diff options
| author | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2022-11-21 16:37:34 +0100 |
|---|---|---|
| committer | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2023-02-08 11:22:23 +0100 |
| commit | bf73772d2c43a71d13a55e9914c631591cd01815 (patch) | |
| tree | 3d6954fa946b5c664af10bf4be242a49a255466f /build_scripts/config.py | |
| parent | 08ec50ff3b569e2062285ee633f5c7e548c67545 (diff) | |
PySide Build: find qtpaths before SetupRunner.run_setup()
- 'qtpaths' needs to be known while setting up the corresponding
setup.py command to ignore the pyside qt wrapper tools whose qt tool
does not exist
- This is an extension to 43109854a2966afe2e0cf29961157a6f54d5775c.
The aforementioned patch led to qtpaths being found 2 times, once
inside CommandMixin class and also much before that inside
SetupRunner.run_setup(). This redundancy is now removed by moving
the finding of OPTION['QTPATHS'] outside the mixin and before
CommandMixin object of the command being run is initialized
- the help commands, build_rst_docs and cross compilation command
should not complain about qtpaths anymore
- fixed cross compilation build
Task-number: PYSIDE-2195
Change-Id: I862baf954dea0a3bdaf5ddf411f119178b457c42
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'build_scripts/config.py')
| -rw-r--r-- | build_scripts/config.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/build_scripts/config.py b/build_scripts/config.py index f13ed0482..1f01ccdd4 100644 --- a/build_scripts/config.py +++ b/build_scripts/config.py @@ -199,11 +199,13 @@ class Config(object): setup_kwargs['install_requires'] = [ f"{self.shiboken_module_st_name}=={package_version}" ] - _pyside_tools = available_pyside_tools(qt_tools_path=qt_install_path) - setup_kwargs['entry_points'] = { - 'console_scripts': [f'{PYSIDE}-{tool} = {package_name}.scripts.pyside_tool:{tool}' - for tool in _pyside_tools] - } + if qt_install_path: + _pyside_tools = available_pyside_tools(qt_tools_path=qt_install_path) + setup_kwargs['entry_points'] = { + 'console_scripts': [f'{PYSIDE}-{tool} = {package_name}.scripts.pyside_tool:' + f'{tool}' + for tool in _pyside_tools] + } self.setup_kwargs = setup_kwargs def get_long_description(self): |