From 6494943f2fe4bfa8e550b526698553618572bfd6 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Mon, 22 Aug 2022 20:21:23 -0700 Subject: [PATCH 1/2] Zip FlutterMacOS.framework. This is to move the zipping login to the repository under test. Bug: https://github.com/flutter/flutter/issues/81855 --- sky/tools/create_macos_framework.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sky/tools/create_macos_framework.py b/sky/tools/create_macos_framework.py index c34e20216ca1d..bcf8a47a9c061 100755 --- a/sky/tools/create_macos_framework.py +++ b/sky/tools/create_macos_framework.py @@ -114,6 +114,13 @@ def process_framework(dst, args, fat_framework, fat_framework_binary): subprocess.check_call(["strip", "-x", "-S", fat_framework_binary]) + # Zip FlutterMacOS.framework. + subprocess.check_call([ + 'zip', '-r', + '%s/FlutterMacOS.framework.zip' % dst, + '%s/FlutterMacOS.framework' % dst + ]) + if __name__ == '__main__': sys.exit(main()) From 1c994840f7bd4b3d4638338990a564a08cc7040a Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Tue, 23 Aug 2022 23:05:48 -0700 Subject: [PATCH 2/2] Use dst as the current working directory. --- sky/tools/create_macos_framework.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/sky/tools/create_macos_framework.py b/sky/tools/create_macos_framework.py index bcf8a47a9c061..7f6200070391e 100755 --- a/sky/tools/create_macos_framework.py +++ b/sky/tools/create_macos_framework.py @@ -102,10 +102,9 @@ def process_framework(dst, args, fat_framework, fat_framework_binary): dsym_out = os.path.splitext(fat_framework)[0] + '.dSYM' subprocess.check_call([DSYMUTIL, '-o', dsym_out, fat_framework_binary]) subprocess.check_call([ - 'zip', '-r', - '%s/FlutterMacOS.dSYM.zip' % dst, - '%s/FlutterMacOS.dSYM/Contents' % dst - ]) + 'zip', '-r', 'FlutterMacOS.dSYM.zip', 'FlutterMacOS.dSYM' + ], + cwd=dst) if args.strip: # copy unstripped @@ -116,10 +115,9 @@ def process_framework(dst, args, fat_framework, fat_framework_binary): # Zip FlutterMacOS.framework. subprocess.check_call([ - 'zip', '-r', - '%s/FlutterMacOS.framework.zip' % dst, - '%s/FlutterMacOS.framework' % dst - ]) + 'zip', '-r', 'FlutterMacOS.framework.zip', 'FlutterMacOS.framework' + ], + cwd=dst) if __name__ == '__main__':