Build/copy macOS frameworks to built products instead of ephemeral directory #72378
Conversation
This file contains hidden or 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
jmagman
commented
Dec 15, 2020
| @@ -38,53 +38,36 @@ abstract class UnpackMacOS extends Target { | |||
| ]; | |||
|
|
|||
| @override | |||
| List<Source> get outputs => const <Source>[]; | |||
| List<Source> get outputs => const <Source>[ | |||
| Source.pattern('{OUTPUT_DIR}/FlutterMacOS.framework/FlutterMacOS'), | |||
There was a problem hiding this comment.
Either it's already been copied to build/macos/Build/Products/Debug or it hasn't, so we don't need unpack_macos.d anymore. The subclasses include Source.artifact(Artifact.flutterMacOSFramework, mode: x) which will cause re-copies on flutter upgrades.
stuartmorgan-g
approved these changes
Dec 17, 2020
| '- .DS_Store/', | ||
| basePath, | ||
| environment.outputDir.path, | ||
| ]); |
There was a problem hiding this comment.
Please update the comment on this class, which currently says we're using cp -R.
817cce6 to
5f4394b
Compare
|
Google testing failed, but I don't see any test results for that PR in FRoB, failing or otherwise. Since it 8000 passed before my comment-only change I'll call it good. |
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.
Description
macOS version of #69699 and part of #70224.
Flutter/ephemeral, instead targetBUILT_PRODUCTS_DIR(for examplebuild/macos/Build/Products/Debug/).FRAMEWORK_SEARCH_PATHSbuild setting from template and all example projects to prefer the built products directory, which we always get for free. I didn't write a migrator since leaving this around in existing apps is harmless--theinheritedpart means it will find our copied framework first.This:
flutter build macos --debugis run right before running in Release/archiving in Xcode and some pieces build before the xcconfig can be updated.$CONFIGURATIONs so we don't have to keep track of whether to rebuild or recopy frameworks when switching from Debug to Release. Either the frameworks are inbuild/macos/Build/Products/{Debug,Release}/or they aren't.Related Issues
#72372
Blocked by #72020, which changes plugins from linking on
Flutter/ephemeral/FlutterMacOS.frameworkto instead linking directly on the framework in the engine artifacts.Tests
Updated macos_test
Already validated by macos_content_validation_test