diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-03-23 17:54:06 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-04-06 10:59:27 +0000 |
| commit | 4b3a7463328b657650da873cd485bfd5ced9c247 (patch) | |
| tree | da6ae4f228b30365fc0a6bcfcc68af03cfb4041f /scripts | |
| parent | 16cb026b8bfd8ff25643c7bc1f552c550773d6e5 (diff) | |
CMake build: Fix remaining issues with Devel package
On Linux (and Windows) we should not create toplevel files (README.md
etc) or directories (doc/, scripts/ etc).
On macOS, move the whole Devel package contents into the app bundle,
because that is installed toplevel in the Qt installers, and we
shouldn't even create include/, lib/ or any other directory at the
toplevel at all.
Since the prefix path must now point to the Resources folder inside the
app bundle, adapt build_plugin.py to also accept --qtc-path pointing to
the app bundle (Qt Creator.app) itself, and also to the app bundles
parent directory. Adapt the Qt Creator plugin project template
similarly.
Task-number: QTCREATORBUG-25414
Fixes: QTCREATORBUG-25415
Change-Id: Ic756237fb920b54b1ec95d076649ad947b39a7e8
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build_plugin.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/scripts/build_plugin.py b/scripts/build_plugin.py index 8ec5eb4464..c70d605128 100755 --- a/scripts/build_plugin.py +++ b/scripts/build_plugin.py @@ -69,6 +69,14 @@ def build(args, paths): if not os.path.exists(paths.result): os.makedirs(paths.result) prefix_paths = [os.path.abspath(fp) for fp in args.prefix_paths] + [paths.qt_creator, paths.qt] + if common.is_mac_platform(): + # --qtc-path may be + # "/path/Qt Creator.app/Contents/Resources", + # "/path/Qt Creator.app", or + # "/path", + # so add some variants to the prefix path + prefix_paths += [os.path.join(paths.qt_creator, 'Contents', 'Resources'), + os.path.join(paths.qt_creator, 'Qt Creator.app', 'Contents', 'Resources')] prefix_paths = [common.to_posix_path(fp) for fp in prefix_paths] separate_debug_info_option = 'ON' if args.with_debug_info else 'OFF' cmake_args = ['cmake', |