Improve handling of "extra" files #1771
Merged
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
In swiftlang#1507, we started adding "extra" files to the generated Xcode project. This makes some enhancements to that feature: - Introduce a new flag `--skip-extra-files` to go back to the pre-4.2 behaviour (best behaviour) of not including these files at all - Do not add a file reference for "Package.resolved" since this shouldn't be edited by hand and most people also never have to read it - Move the "extra" file references after the products group. This may be debatable, but I think it more clean to have all file references related to the package manifest grouped together at the top instead of having these interspersed throughout the main group.
neonichu
commented
Aug 30, 2018
| to: { | ||
| $0.xcodeprojOptions.useLegacySchemeGenerator = $1 ?? false | ||
| $0.xcodeprojOptions.enableAutogeneration = $2 ?? false | ||
| $0.xcodeprojOptions.addExtraFiles = !($3 ?? false) |
There was a problem hiding this comment.
This may look weird this way, but I thought it would be cleaner to have the option be positive ("add") vs. negative ("skip").
neonichu
commented
Aug 30, 2018
| @@ -231,6 +231,9 @@ class GenerateXcodeprojTests: XCTestCase { | |||
| let project = try Xcodeproj.generate(projectName: projectName, xcodeprojPath: outpath, graph: graph, options: XcodeprojOptions(), diagnostics: diagnostics) | |||
|
|
|||
| XCTAssertTrue(project.mainGroup.subitems.contains { $0.path == "a.txt" }) | |||
|
|
|||
| let projectWithoutExtraFiles = try Xcodeproj.generate(projectName: projectName, xcodeprojPath: outpath, graph: graph, options: XcodeprojOptions(addExtraFiles: false), diagnostics: diagnostics) | |||
| XCTAssertFalse(projectWithoutExtraFiles.mainGroup.subitems.contains { $0.path == "a.txt" }) | |||
There was a problem hiding this comment.
Maybe we should create an extra test case for this? Seems easier to share the setup code, though.
|
@swift-ci please smoke test |
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.
In #1507, we started adding "extra" files to the generated Xcode
project. This makes some enhancements to that feature:
--skip-extra-filesto go back to the pre-4.2 behaviour (best behaviour) of not including these files at all