forked from qt-creator/qt-creator
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 <tim.jenssen@qt.io>
This commit is contained in:
@@ -247,12 +247,20 @@ def build_qtcreatorcdbext(args, paths):
|
|||||||
'--component', 'qtcreatorcdbext'],
|
'--component', 'qtcreatorcdbext'],
|
||||||
paths.qtcreatorcdbext_build)
|
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):
|
def package_qtcreator(args, paths):
|
||||||
if not args.no_zip:
|
if not args.no_zip:
|
||||||
if not args.no_qtcreator:
|
if not args.no_qtcreator:
|
||||||
common.check_print_call(['7z', 'a', '-mmt' + args.zip_threads,
|
common.check_print_call(['7z', 'a', '-mmt' + args.zip_threads,
|
||||||
os.path.join(paths.result, 'qtcreator' + args.zip_infix + '.7z'),
|
os.path.join(paths.result, 'qtcreator' + args.zip_infix + '.7z'),
|
||||||
'*'],
|
zipPatternForApp(paths)],
|
||||||
paths.install)
|
paths.install)
|
||||||
common.check_print_call(['7z', 'a', '-mmt' + args.zip_threads,
|
common.check_print_call(['7z', 'a', '-mmt' + args.zip_threads,
|
||||||
os.path.join(paths.result, 'qtcreator' + args.zip_infix + '_dev.7z'),
|
os.path.join(paths.result, 'qtcreator' + args.zip_infix + '_dev.7z'),
|
||||||
|
Reference in New Issue
Block a user