Ensure custom search path settings are included in generated projects #751
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
- The previous logic was setting the `$(inherited)` and the derived search paths seperately - This caused the derrived search paths to replace any existing custom settings - To solve this, we can set the derived search paths and the `$(inherited)` setting as one setting - This allows the extend helper method to extend existing settings Test Plan: - Run `tuist generate` within `fixtures/ios_app_with_static_libraries` - Inspect the generated workspace, Module A should have a `$(SRCROOT/CustomHeader` header search path
kwridan
commented
Dec 5, 2019
pepicrft
approved these changes
Dec 5, 2019
👍 Also don't forget about the CHANGELOG :) |
|
Updated the changelog! The remaining checks are failing for different reason, I wonder if its due to submitting a PR from a fork?
|
pepicrft
pushed a commit
that referenced
this pull request
Dec 9, 2019
…#751) Resolves #750 - The previous logic was setting the `$(inherited)` and the derived search paths seperately - This caused the derrived search paths to replace any existing custom settings - To solve this, we can set the derived search paths and the `$(inherited)` setting as one setting - This allows the extend helper method to extend existing settings Test Plan: - Run `tuist generate` within `fixtures/ios_app_with_static_libraries` - Inspect the generated workspace, Module A should have a `$(SRCROOT/CustomHeader` header search path
kwridan
added a commit
to bloomberg/tuist
that referenced
this pull request
Dec 12, 2019
- In the even two library dependencies shared the same `publicHeaders` path (e.g. `libcrypto.a` and `libssl.a` in OpenSSL) duplicate entries were added to the `HEADER_SEARCH_PATHS` build setting - This was regressed due to an earlier change tuist#751 - previously the uniquing was happening in the settings helper when build settings were extended multiple times - To resolve this, we now ensure we unique paths being added - Additionally a test is included to ensure this doesn't regress in the future Test Plan: - Verify the unit tests pass
kwridan
added a commit
to bloomberg/tuist
that referenced
this pull request
Dec 12, 2019
- In the even two library dependencies shared the same `publicHeaders` path (e.g. `libcrypto.a` and `libssl.a` in OpenSSL) duplicate entries were added to the `HEADER_SEARCH_PATHS` build setting - This was regressed due to an earlier change tuist#751 - previously the uniquing was happening in the settings helper when build settings were extended multiple times - To resolve this, we now ensure we unique paths being added - Additionally a test is included to ensure this doesn't regress in the future Test Plan: - Verify the unit tests pass
3 tasks
kwridan
added a commit
that referenced
this pull request
Dec 12, 2019
- In the even two library dependencies shared the same `publicHeaders` path (e.g. `libcrypto.a` and `libssl.a` in OpenSSL) duplicate entries were added to the `HEADER_SEARCH_PATHS` build setting - This was regressed due to an earlier change #751 - previously the uniquing was happening in the settings helper when build settings were extended multiple times - To resolve this, we now ensure we unique paths being added - Additionally a test is included to ensure this doesn't regress in the future Test Plan: - Verify the unit tests pass A bit of a contrived manual test case update the fixture in `fixtures/ios_app_with_static_libraries/Modules/A/Project.swift` ```swift let project = Project(name: "A", targets: [ Target(name: "A", platform: .iOS, product: .staticLibrary, bundleId: "io.tuist.A", infoPlist: "Info.plist", sources: "Sources/**", dependencies: [ .project(target: "B", path: "../B"), .library(path: "../C/prebuilt/C/libC.a", publicHeaders: "../C/prebuilt/C", swiftModuleMap: "../C/prebuilt/C/C.swiftmodule"), // Add a duplicate .library(path: "../C/prebuilt/C/libC.a", publicHeaders: "../C/prebuilt/C", swiftModuleMap: "../C/prebuilt/C/C.swiftmodule") ]) ]) ``` This of course causes a duplicate binary (hence why it wasn't included) but can help illustrate a situation where two `.library` dependencies point to the same `publicHeaders` path.
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.
Resolves #750
Short description 📝
Specifying a custom
HEADER_SEARCH_PATHSorFRAMEWORK_SEARCH_PATHSbuild setting in manifest is ignored in the event a project has a static library dependency.Solution 📦
$(inherited)and the derived search paths seperately$(inherited)setting as one settingImplementation 👩💻👨💻
LinkGeneratorTest Plan 🛠
tuist generatewithinfixtures/ios_app_with_static_libraries$(SRCROOT/CustomHeaderheader search path