diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-01-12 13:59:10 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-01-12 13:59:10 +0100 |
| commit | 9056d708fa0886efaf10c7504d185afa0747a947 (patch) | |
| tree | f4c3a573d1a8cac88ea840db6ca7f82e808f85fb /scripts | |
| parent | 0614d9ba4dc255d70085f8e824b6ad46ba50faa4 (diff) | |
| parent | ad1340cbe64c2f962c3dd176aa297fd7b4d5e7cd (diff) | |
Merge remote-tracking branch 'origin/6.0'
Change-Id: I642abb110bb120e20af11a5d55244c03e6c48caa
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build.py | 30 | ||||
| -rwxr-xr-x | scripts/deployqtHelper_mac.sh | 2 |
2 files changed, 23 insertions, 9 deletions
diff --git a/scripts/build.py b/scripts/build.py index 84ea1c3232..9b1a46c1c4 100755 --- a/scripts/build.py +++ b/scripts/build.py @@ -293,16 +293,30 @@ def package_qtcreator(args, paths): '*'], paths.qtcreatorcdbext_install) - if common.is_mac_platform() and not args.no_dmg and not args.no_qtcreator: + if common.is_mac_platform() and not args.no_qtcreator: if args.keychain_unlock_script: common.check_print_call([args.keychain_unlock_script], paths.install) - common.check_print_call(['python', '-u', - os.path.join(paths.src, 'scripts', 'makedmg.py'), - 'qt-creator' + args.zip_infix + '.dmg', - 'Qt Creator', - paths.src, - paths.install], - paths.result) + if os.environ.get('SIGNING_IDENTITY'): + signed_install_path = paths.install + '-signed' + common.copytree(paths.install, signed_install_path, symlinks=True) + apps = [d for d in os.listdir(signed_install_path) if d.endswith('.app')] + if apps: + app = apps[0] + common.codesign(os.path.join(signed_install_path, app)) + if not args.no_zip: + common.check_print_call(['7z', 'a', '-mmt' + args.zip_threads, + os.path.join(paths.result, 'qtcreator' + args.zip_infix + '-signed.7z'), + app], + signed_install_path) + if not args.no_dmg: + common.check_print_call(['python', '-u', + os.path.join(paths.src, 'scripts', 'makedmg.py'), + 'qt-creator' + args.zip_infix + '.dmg', + 'Qt Creator', + paths.src, + paths.install], + paths.result) + def get_paths(args): Paths = collections.namedtuple('Paths', diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index 3387b67847..e8f46032a4 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -168,7 +168,7 @@ if [ $LLVM_INSTALL_DIR ]; then cp -Rf "$clangtidysource" "$libexec_path/clang/bin/" || exit 1 clazysource="$LLVM_INSTALL_DIR"/bin/clazy-standalone cp -Rf "$clazysource" "$libexec_path/clang/bin/" || exit 1 - install_name_tool -add_rpath "@executable_path/../lib" "$libexec_path/clang/bin/clazy-standalone" || exit 1 + install_name_tool -add_rpath "@executable_path/../lib" "$libexec_path/clang/bin/clazy-standalone" 2> /dev/null install_name_tool -delete_rpath "/Users/qt/work/build/libclang/lib" "$libexec_path/clang/bin/clazy-standalone" 2> /dev/null fi clangbackendArgument="-executable=$libexec_path/clangbackend" |