diff options
author | Eike Ziller <eike.ziller@qt.io> | 2020-10-22 15:07:57 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2020-10-22 16:54:34 +0000 |
commit | 22f24bc7fa3b254d7296dd041edd15be2f0d16f0 (patch) | |
tree | 5dcc64bb9c37f37bf5b2397d7e50d695107795d4 | |
parent | e8978e152d0169966cf97e5a0de98a25ce4756e8 (diff) |
QtCreator/cmake: Build with inter-plugin dependenciesv6.0.0-beta2-packaging
Makes the commercial plugins depend on LicenseChecker again.
Fixes: QTCREATORBUG-23913
Change-Id: Iff4a485fd1fcc4976530b8ba16b7dcf4307eca3a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r-- | packaging-tools/build_wrapper.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/packaging-tools/build_wrapper.py b/packaging-tools/build_wrapper.py index 5d43e76eb..d669be750 100644 --- a/packaging-tools/build_wrapper.py +++ b/packaging-tools/build_wrapper.py @@ -629,6 +629,15 @@ def build_qtcreator_plugins(plugins, qtcreator_path, qtcreator_dev_path, icu_url '--qt-path', qt_path, '--qtc-path', qtcreator_path, '--output-path', work_dir] + for dependency_name in plugin.dependencies: + matches = [dep for dep in plugins if dep.name == dependency_name] + if not matches: + raise RuntimeError('did not find dependency "{0}" for plugin "{1}"'.format(dependency_name, plugin.name)) + dependency = matches[0] + cmd_arguments.extend(['--add-path', os.path.join(work_dir, dependency.name + '-build', 'build')]) + for module in dependency.modules: + if module not in modules: + modules.append(module) cmd_arguments.extend(plugin.additional_arguments) else: cmd_arguments = ['python', '-u', os.path.join(SCRIPT_ROOT_DIR, 'bld_qtcreator_plugins.py'), |