feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Build: Fix 7zip command for ARM machines also for plugins

Browse Source 
Amends 14e04c0325

Change-Id: Ice95e62d451f1d4d65245337d01ce7481501fdbb
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
This commit is contained in:
Eike Ziller
2024-10-11 13:14:31 +02:00
parent a8f9f742c9
commit 20a21b3472
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/build_plugin.py
View File

@@ -147,16 +147,19 @@ def package(args, paths):
if common.is_windows_platform() and args.sign_command: if common.is_windows_platform() and args.sign_command:
command = shlex.split(args.sign_command) command = shlex.split(args.sign_command)
common.check_print_call(command + [paths.install]) common.check_print_call(command + [paths.install])
common.check_print_call(['7z', 'a', '-mmt' + args.zip_threads, os.path.join(paths.result, args.name + '.7z'), '*'], # use -mf=off to avoid usage of the ARM executable compression filter,
# which cannot be extracted by p7zip
zip = ['7z', 'a', '-mmt' + args.zip_threads, '-mf=off']
common.check_print_call(zip + [os.path.join(paths.result, args.name + '.7z'), '*'],
paths.install) paths.install)
if os.path.exists(paths.dev_install): # some plugins might not provide anything in Devel if os.path.exists(paths.dev_install): # some plugins might not provide anything in Devel
common.check_print_call(['7z', 'a', '-mmt' + args.zip_threads, common.check_print_call(zip
os.path.join(paths.result, args.name + '_dev.7z'), '*'], + [os.path.join(paths.result, args.name + '_dev.7z'), '*'],
paths.dev_install) paths.dev_install)
# check for existence - the DebugInfo install target doesn't work for telemetry plugin # check for existence - the DebugInfo install target doesn't work for telemetry plugin
if args.with_debug_info and os.path.exists(paths.debug_install): if args.with_debug_info and os.path.exists(paths.debug_install):
common.check_print_call(['7z', 'a', '-mmt' + args.zip_threads, common.check_print_call(zip
os.path.join(paths.result, args.name + '-debug.7z'), '*'], + [os.path.join(paths.result, args.name + '-debug.7z'), '*'],
paths.debug_install) paths.debug_install)
if common.is_mac_platform() and common.codesign_call(): if common.is_mac_platform() and common.codesign_call():
if args.keychain_unlock_script: if args.keychain_unlock_script:
@@ -169,8 +172,8 @@ def package(args, paths):
app = apps[0] app = apps[0]
common.conditional_sign_recursive(os.path.join(signed_install_path, app), common.conditional_sign_recursive(os.path.join(signed_install_path, app),
lambda ff: ff.endswith('.dylib')) lambda ff: ff.endswith('.dylib'))
common.check_print_call(['7z', 'a', '-mmt' + args.zip_threads, common.check_print_call(zip
os.path.join(paths.result, args.name + '-signed.7z'), + [os.path.join(paths.result, args.name + '-signed.7z'),
app], app],
signed_install_path) signed_install_path)