From 2e9e107191ab04898cdc3f8f1da470a4d37ce2b6 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 7 Jun 2024 12:14:50 +0200 Subject: [PATCH] build.py: Avoid ARM 7z compression filter Which fails to extract with (older?) p7zip from Linux distributions, which is used for building online repositories. Change-Id: Ia9032293841cf192b9b2e0ff820ca4a8b7f47763 Reviewed-by: Patrik Teivonen Reviewed-by: David Schulz --- scripts/build.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/build.py b/scripts/build.py index 66d5d25d43a..094cc9d6c4b 100755 --- a/scripts/build.py +++ b/scripts/build.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (C) 2020 The Qt Company Ltd. +# Copyright (C) 2024 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 # import the print function which is used in python 3.x @@ -295,12 +295,15 @@ def package_qtcreator(args, paths): '*'], paths.debug_install) if common.is_windows_platform(): - common.check_print_call(['7z', 'a', '-mmt' + args.zip_threads, + # use -mf=off to avoid usage of the ARM executable compression filter, + # which cannot be extracted by the p7zip version on the machine doing + # the repository builds + common.check_print_call(['7z', 'a', '-mmt' + args.zip_threads, '-mf=off', os.path.join(paths.result, 'wininterrupt' + args.zip_infix + '.7z'), '*'], paths.wininterrupt_install) if not args.no_cdb: - common.check_print_call(['7z', 'a', '-mmt' + args.zip_threads, + common.check_print_call(['7z', 'a', '-mmt' + args.zip_threads, '-mf=off', os.path.join(paths.result, 'qtcreatorcdbext' + args.zip_infix + '.7z'), '*'], paths.qtcreatorcdbext_install)