macOS: Clean up create_ios_framework.py #54543
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This doesn't add/change any functionality; just makes use of the common code in |
zanderso
approved these changes
Aug 13, 2024
cbracken
force-pushed
the
embed-macos-dsyms
branch
2 times, most recently
from
e099bca
to
b53c11e
Compare
cbracken
added
the
autosubmit
Over time, this script and others in sky/tools have accumulated a lot of additional and sometimes duplicate code. This is a first pass cleanup of create_macos_framework.py to extract common utility code to utils.py and refactor for better readability. The iOS analogue of this patch was flutter#54500.
cbracken
force-pushed
the
embed-macos-dsyms
branch
from
b53c11e
to
22302c0
Compare
jmagman
reviewed
Aug 13, 2024
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Aug 14, 2024
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Aug 14, 2024
|
Reason for revert: Failing roll flutter/flutter#153406 |
zanderso
added
the
revert
auto-submit bot
pushed a commit
that referenced
this pull request
Aug 14, 2024
This reverts commit 0339bfe.
8 tasks
auto-submit
bot
removed
the
revert
auto-submit bot
added a commit
that referenced
this pull request
Aug 14, 2024
Reverts: #54543 Initiated by: zanderso Reason for reverting: Failing roll flutter/flutter#153406 Original PR Author: cbracken Reviewed By: {zanderso} This change reverts the following previous change: Over time, this script and others in sky/tools have accumulated a lot of additional and sometimes duplicate code. This is a first pass cleanup of create_macos_framework.py to extract common utility code to utils.py and refactor for better readability. The iOS analogue of this patch was #54500. [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Aug 14, 2024
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Aug 14, 2024
auto-submit bot
pushed a commit
to flutter/flutter
that referenced
this pull request
Aug 14, 2024
…sions) (#153413) Manual roll requested by zra@google.com flutter/engine@019f9e3...5909666 2024-08-14 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Roll Dart SDK from 44635f897535 to 733062367c2e (1 revision) (#54541)" (flutter/engine#54552) 2024-08-14 98614782+auto-submit[bot]@users.noreply.github.com Reverts "macOS: Clean up create_ios_framework.py (#54543)" (flutter/engine#54550) 2024-08-14 98614782+auto-submit[bot]@users.noreply.github.com Reverts "macOS: refactor create_macos_framework.py (#54546)" (flutter/engine#54549) 2024-08-14 chris@bracken.jp macOS: refactor create_macos_framework.py (flutter/engine#54546) 2024-08-13 flar@google.com [DisplayList] Allow random access to ops through indexing (flutter/engine#54484) 2024-08-13 mit@google.com Update dartdoc for gpu.dart (flutter/engine#54529) 2024-08-13 chris@bracken.jp macOS: Clean up create_ios_framework.py (flutter/engine#54543) 2024-08-13 skia-flutter-autoroll@skia.org Roll Dart SDK from 44635f897535 to 733062367c2e (1 revision) (flutter/engine#54541) 2024-08-13 skia-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from 2LTVy4Gv76DcMpz4V... to MeV5i7xXXFPHF5sBK... (flutter/engine#54542) 2024-08-13 1961493+harryterkelsen@users.noreply.github.com [canvaskit] Add animation detection for GIFs (flutter/engine#54483) 2024-08-13 matej.knopp@gmail.com Preserve background frame damage (flutter/engine#54540) 2024-08-13 68449066+zijiehe-google-com@users.noreply.github.com [fuchsia] Use BundledTestRunner from test-scripts (flutter/engine#54404) Also rolling transitive DEPS: fuchsia/sdk/core/linux-amd64 from 2LTVy4Gv76Dc to MeV5i7xXXFPH If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Please CC rmistry@google.com,zra@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
cbracken
added a commit
that referenced
this pull request
Aug 14, 2024
Over time, this script and others in sky/tools have accumulated a lot of additional and sometimes duplicate code. This is a first pass cleanup of create_macos_framework.py to extract common utility code to utils.py and refactor for better readability. The iOS analogue of this patch was #54500. This is a reland of #54543, which failed to set the `-y` option on zip when zipping `FlutterMacOS.xcframework` but did so for the other zip steps where required. Since there is no case where we *want* to archive dereferenced symlinks, and because it's required for macOS frameworks, we now set this option for all callers in the `sky_tools.create_zip()` function to avoid future cases where someone working on this code misses one. If we ever need it, we can extract a parameter. This patch also references the correct script in its description (the original incorrectly mentioned `create_ios_framework.py`). [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
8 tasks
auto-submit bot
pushed a commit
that referenced
this pull request
Aug 14, 2024
Over time, this script and others in `sky/tools` have accumulated a lot of additional and sometimes duplicate code. This is a first pass cleanup of `create_macos_framework.py` to extract common utility code to `sky/utils.py` and refactor for better readability. The iOS analogue of this patch was #54500. This is a reland of #54543 (reverted in #54550), which failed to set the `-y` option (preserve symlinks) when zipping `FlutterMacOS.xcframework` but did so for the other zip steps where required. Since there is no case where we *want* to archive dereferenced symlinks, and because it's required for macOS frameworks, we now set this option for all callers in the `sky_tools.create_zip()` function to avoid future cases where someone working on this code misses one. If we ever need it, we can extract a parameter. This patch also references the correct script in its description (the original incorrectly mentioned `create_ios_framework.py`). [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
8 tasks
cbracken
added a commit
to cbracken/flutter_engine
that referenced
this pull request
Aug 14, 2024
This is a refactoring with no semantic changes. This refactors the macOS framework creation code to be more readable, and extracts it to `sky_utils.py`. While I was pulling this out, also generalised the code to not hardcode `FlutterMacOS.framework` in case we one day manage to generate the iOS and macOS frameworks with the same name. This is a reland of flutter#54546 (reverted in flutter#54549), the original was reverted in order to revert flutter#54543 (reverted in flutter#54550), which was reverted because it failed to preserve symlinks while zipping the macOS framework. That patch has been relanded with a fix in flutter#54555. This patch has been rebased to tip-of-tree for attempt two.
auto-submit bot
pushed a commit
that referenced
this pull request
Aug 14, 2024
This is a refactoring with no semantic changes. This refactors the macOS framework creation code to be more readable, and extracts it to `sky_utils.py`. While I was pulling this out, also generalised the code to not hardcode `FlutterMacOS.framework` in case we one day manage to generate the iOS and macOS frameworks with the same name. This is a reland of #54546 (reverted in #54549), the original was reverted in order to revert #54543 (reverted in #54550), which was reverted because it failed to preserve symlinks while zipping the macOS framework. That patch has been relanded with a fix in #54555. This patch has been rebased to tip-of-tree for attempt two. [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
8 tasks
auto-submit bot
added a commit
that referenced
this pull request
Aug 15, 2024
Reverts: #54557 Initiated by: zanderso Reason for reverting: Failing on framework tests on the roll https://ci.chromium.org/ui/p/flutter/builders/try/Mac_arm64%20run_debug_test_macos/9841/overview Original PR Author: cbracken Reviewed By: {jmagman} This change reverts the following previous change: This is a refactoring with no semantic changes. This refactors the macOS framework creation code to be more readable, and extracts it to `sky_utils.py`. While I was pulling this out, also generalised the code to not hardcode `FlutterMacOS.framework` in case we one day manage to generate the iOS and macOS frameworks with the same name. This is a reland of #54546 (reverted in #54549), the original was reverted in order to revert #54543 (reverted in #54550), which was reverted because it failed to preserve symlinks while zipping the macOS framework. That patch has been relanded with a fix in #54555. This patch has been rebased to tip-of-tree for attempt two. [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
DBowen33
pushed a commit
to DBowen33/flutter
that referenced
this pull request
Aug 16, 2024
…sions) (flutter#153413) Manual roll requested by zra@google.com flutter/engine@019f9e3...5909666 2024-08-14 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Roll Dart SDK from 44635f897535 to 733062367c2e (1 revision) (flutter#54541)" (flutter/engine#54552) 2024-08-14 98614782+auto-submit[bot]@users.noreply.github.com Reverts "macOS: Clean up create_ios_framework.py (flutter#54543)" (flutter/engine#54550) 2024-08-14 98614782+auto-submit[bot]@users.noreply.github.com Reverts "macOS: refactor create_macos_framework.py (flutter#54546)" (flutter/engine#54549) 2024-08-14 chris@bracken.jp macOS: refactor create_macos_framework.py (flutter/engine#54546) 2024-08-13 flar@google.com [DisplayList] Allow random access to ops through indexing (flutter/engine#54484) 2024-08-13 mit@google.com Update dartdoc for gpu.dart (flutter/engine#54529) 2024-08-13 chris@bracken.jp macOS: Clean up create_ios_framework.py (flutter/engine#54543) 2024-08-13 skia-flutter-autoroll@skia.org Roll Dart SDK from 44635f897535 to 733062367c2e (1 revision) (flutter/engine#54541) 2024-08-13 skia-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from 2LTVy4Gv76DcMpz4V... to MeV5i7xXXFPHF5sBK... (flutter/engine#54542) 2024-08-13 1961493+harryterkelsen@users.noreply.github.com [canvaskit] Add animation detection for GIFs (flutter/engine#54483) 2024-08-13 matej.knopp@gmail.com Preserve background frame damage (flutter/engine#54540) 2024-08-13 68449066+zijiehe-google-com@users.noreply.github.com [fuchsia] Use BundledTestRunner from test-scripts (flutter/engine#54404) Also rolling transitive DEPS: fuchsia/sdk/core/linux-amd64 from 2LTVy4Gv76Dc to MeV5i7xXXFPH If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Please CC rmistry@google.com,zra@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Buchimi
pushed a commit
to Buchimi/flutter
that referenced
this pull request
Sep 2, 2024
…sions) (flutter#153413) Manual roll requested by zra@google.com flutter/engine@019f9e3...5909666 2024-08-14 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Roll Dart SDK from 44635f897535 to 733062367c2e (1 revision) (flutter#54541)" (flutter/engine#54552) 2024-08-14 98614782+auto-submit[bot]@users.noreply.github.com Reverts "macOS: Clean up create_ios_framework.py (flutter#54543)" (flutter/engine#54550) 2024-08-14 98614782+auto-submit[bot]@users.noreply.github.com Reverts "macOS: refactor create_macos_framework.py (flutter#54546)" (flutter/engine#54549) 2024-08-14 chris@bracken.jp macOS: refactor create_macos_framework.py (flutter/engine#54546) 2024-08-13 flar@google.com [DisplayList] Allow random access to ops through indexing (flutter/engine#54484) 2024-08-13 mit@google.com Update dartdoc for gpu.dart (flutter/engine#54529) 2024-08-13 chris@bracken.jp macOS: Clean up create_ios_framework.py (flutter/engine#54543) 2024-08-13 skia-flutter-autoroll@skia.org Roll Dart SDK from 44635f897535 to 733062367c2e (1 revision) (flutter/engine#54541) 2024-08-13 skia-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from 2LTVy4Gv76DcMpz4V... to MeV5i7xXXFPHF5sBK... (flutter/engine#54542) 2024-08-13 1961493+harryterkelsen@users.noreply.github.com [canvaskit] Add animation detection for GIFs (flutter/engine#54483) 2024-08-13 matej.knopp@gmail.com Preserve background frame damage (flutter/engine#54540) 2024-08-13 68449066+zijiehe-google-com@users.noreply.github.com [fuchsia] Use BundledTestRunner from test-scripts (flutter/engine#54404) Also rolling transitive DEPS: fuchsia/sdk/core/linux-amd64 from 2LTVy4Gv76Dc to MeV5i7xXXFPH If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Please CC rmistry@google.com,zra@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Over time, this script and others in sky/tools have accumulated a lot of additional and sometimes duplicate code.
This is a first pass cleanup of create_macos_framework.py to extract common utility code to utils.py and refactor for better readability.
The iOS analogue of this patch was #54500.
Pre-launch Checklist
///).If you need help, consider asking for advice on the #hackers-new channel on Discord.