Enable virtual file system overlay replacements #71
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 reverts commit b2d4776.
polac24
commented
Feb 4, 2022
| let overlayRemapper = try OverlayDependenciesRemapper( | ||
| overlayReader: overlayReader | ||
| ) | ||
| let pathRemapper = DependenciesRemapperComposite([overlayRemapper, envsRemapper]) |
There was a problem hiding this comment.
DependenciesRemapperComposite has a logic to invert remappers when making the generic->local transformation
polac24
commented
Feb 7, 2022
| @@ -0,0 +1 @@ | |||
| {"case-sensitive":"false","roots":[],"version":0} | |||
There was a problem hiding this comment.
The default overlay when no dynamic libraries/frameworks are built
| @@ -179,8 +179,7 @@ def self.run_cocoapods_scenario(template_path) | |||
| dump_podfile(consumer_configuration, template_path) | |||
| puts('Building consumer ...') | |||
| Dir.chdir(E2E_COCOAPODS_SAMPLE_DIR) do | |||
| # TODO: Change DerivedData's path to emulate multi-machines setup. Blocked by #59 | |||
| build_project({'derivedDataPath' => "#{DERIVED_DATA_PATH}"}) | |||
| build_project({'derivedDataPath' => "#{DERIVED_DATA_PATH}_consumer"}) | |||
There was a problem hiding this comment.
This PR resolves that - previously some absolute paths in meta were causing cache miss
CognitiveDisson
approved these changes
Feb 7, 2022
| class OverlayDependenciesRemapper: DependenciesRemapper { | ||
| private var mappings: [OverlayMapping] | ||
|
|
||
| init(overlayReader: OverlayReader) throws { |
There was a problem hiding this comment.
Nit: I would try to avoid throwing exceptions and executing any logic during initialization
There was a problem hiding this comment.
Yep, I did that because we already had a protocol DependenciesRemapper and didn't want to introduce noise. Let me do that in a separate PR.
This was referenced Feb 7, 2022
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.
Part II of the Virtual File System Support (#70 continuation)
Problem:
When dynamic libraries are built in parallel, Xcode provides a mapping for virtual file system (
-vfsoverlayargument) because some dependency files may not be ready yet, e.g. prepared.frameworkand compilers should look into "temporary" locations. Because these temporary locations are reported as dependencies, their absolute paths might leak to a meta json.Solution
This PR inserts an extra step in the producer and consumer flows:
$(TARGET_TEMP_DIR)/all-product-headers.yaml) replacement is performed for all recognized dependencies, before applying any ENV mappings (e.g. to substitute$(SRCROOT)) - a change toXCPostbuild$(TARGET_TEMP_DIR)/all-product-headers.yaml) replacement is performed for all recognized dependencies, after applying any ENV mappings (e.g. to substitute$(SRCROOT)) - a change toXCPrebuildFixes #59