diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-03-01 09:11:36 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-03-01 14:27:04 +0000 |
| commit | 03cd08d46da42451bc198f2c3b32aa9e94a8b09f (patch) | |
| tree | 1ef7058372aee7f3cc174d5c54e44fc172ad907b | |
| parent | 1429bf4b27093f2cf2c7b889c35a2d4387c148ec (diff) | |
QtCreator: Skip sdktool for repackaging if not available
Change-Id: I71eaebd610cbc9b28bde3ed2f048fcd840255875
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| -rw-r--r-- | packaging-tools/build_wrapper.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/packaging-tools/build_wrapper.py b/packaging-tools/build_wrapper.py index afdb32901..6a1a97903 100644 --- a/packaging-tools/build_wrapper.py +++ b/packaging-tools/build_wrapper.py @@ -879,11 +879,12 @@ def repackage_and_sign_qtcreator(qtcreator_path, work_dir, result_package, apps = [d for d in os.listdir(extract_path) if d.endswith('.app')] app = apps[0] # extract sdktool - check_call_log(['7z', 'x', '-y', - os.path.join(work_dir, sdktool_package), - '-o' + os.path.join(extract_path, app, - 'Contents', 'Resources', 'libexec')], - work_dir, log_filepath=log_filepath) + if os.path.isfile(os.path.join(work_dir, sdktool_package)): + check_call_log(['7z', 'x', '-y', + os.path.join(work_dir, sdktool_package), + '-o' + os.path.join(extract_path, app, + 'Contents', 'Resources', 'libexec')], + work_dir, log_filepath=log_filepath) # extract plugins (if applicable) if additional_plugins: for plugin in additional_plugins: |