From 57243d4dc62db9ae4738c08c13ad84755fe23fb0 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 18 Aug 2021 13:11:08 +0200 Subject: [PATCH] build.py: Only zip the .app on macOS Not the full contents of the folder containing the app. Works around QTBUG-95845 Change-Id: Id515142b99891e89d0f4db5dae009c481939811f Reviewed-by: Tim Jenssen --- scripts/build.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/build.py b/scripts/build.py index b0a3d20a1cd..055a5aefe55 100755 --- a/scripts/build.py +++ b/scripts/build.py @@ -247,12 +247,20 @@ def build_qtcreatorcdbext(args, paths): '--component', 'qtcreatorcdbext'], paths.qtcreatorcdbext_build) +def zipPatternForApp(paths): + # workaround for QTBUG-95845 + if not common.is_mac_platform(): + return '*' + apps = [d for d in os.listdir(paths.install) if d.endswith('.app')] + return apps[0] if apps else '*' + + def package_qtcreator(args, paths): if not args.no_zip: if not args.no_qtcreator: common.check_print_call(['7z', 'a', '-mmt' + args.zip_threads, os.path.join(paths.result, 'qtcreator' + args.zip_infix + '.7z'), - '*'], + zipPatternForApp(paths)], paths.install) common.check_print_call(['7z', 'a', '-mmt' + args.zip_threads, os.path.join(paths.result, 'qtcreator' + args.zip_infix + '_dev.7z'),