Allow sources anywhere in ./Sources when only one target is present #6294
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
neonichu
reviewed
Mar 16, 2023
bitjammer
force-pushed
the
acgarland/rdar-106829666-allow-sources-dir-for-single-target
branch
3 times, most recently
from
09a61c9 to
60c3e7b
Compare
|
@swift-ci Please smoke test |
MaxDesiatov
reviewed
Mar 17, 2023
MaxDesiatov
reviewed
Mar 17, 2023
|
Do we need a matching behavior for tests? |
bitjammer
force-pushed
the
acgarland/rdar-106829666-allow-sources-dir-for-single-target
branch
from
60c3e7b to
15360c5
Compare
|
Added to the change log. |
|
@swift-ci smoke test |
|
@swift-ci test windows |
bitjammer
force-pushed
the
acgarland/rdar-106829666-allow-sources-dir-for-single-target
branch
from
15360c5 to
a02f461
Compare
|
@swift-ci Please smoke test |
tomerd
reviewed
Mar 20, 2023
tomerd
reviewed
Mar 20, 2023
bitjammer
force-pushed
the
acgarland/rdar-106829666-allow-sources-dir-for-single-target
branch
from
a02f461 to
44b00a1
Compare
After getting some feedback about the added `path` argument for executable packages generated with `swift package init` (swiftlang#6144), this change allows a target's sources to occupy the entire "predefined sources directory" (e.g. `Sources`, `Tests`, or `Plugins`) when there is only one target of a specific kind occupying one of those directories in the package. All package types can benefit from this. For example, if there is only one library target and one test target, one can put sources directly in `./Sources` and `./Tests`. Adding another library means that one has to put the sources for TargetA in `./Sources/TargetA` and the sources for TargetB in `./Sources/TargetB`, and so on. When there is more than one target of a type in a package, the existing requirements for target sources still apply. This change should be compatible with existing layouts as well. If there is only a single target in a package, then sources can of course continue to exist exclusively in `./Sources/<target>`, or `./Tests/<testTarget>`, etc. Amend the `executable` and `tool` template's generated manifest to not include the `path` argument anymore as it is no longer needed. With this change, the `library` template type can also put its sources and tests directly in the `./Sources` and `./Tests` directories respectively. All of the above only takes place when the tools version is set to 5.9 or higher in the manifest. rdar://106829666
bitjammer
force-pushed
the
acgarland/rdar-106829666-allow-sources-dir-for-single-target
branch
from
44b00a1 to
aab4c83
Compare
|
@swift-ci Please smoke test |
|
@swift-ci Please test Windows platform |
bitjammer
deleted the
acgarland/rdar-106829666-allow-sources-dir-for-single-target
branch
kkebo
added a commit
to kkebo/DevToys.swiftpm
that referenced
this pull request
Nov 27, 2023
We can now unwrap a target folder when there's only one target since Swift 5.9's [this change](swiftlang/swift-package-manager#6294).
kkebo
added a commit
to kkebo/ConsolePad.swiftpm
that referenced
this pull request
Nov 27, 2023
We can now unwrap a target folder when there's only one target since Swift 5.9's [this change](swiftlang/swift-package-manager#6294).
This was referenced Nov 27, 2023
kkebo
added a commit
to kkebo/CoreMLDemos.swiftpm
that referenced
this pull request
Nov 27, 2023
We can now unwrap a target folder when there's only one target since Swift 5.9's [this change](swiftlang/swift-package-manager#6294).
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.
After getting some feedback about the added
pathargument for executable packages generated withswift package init(#6144), this change allows a target's sources to occupy the entire sources directory when there is only one target in the package. All package types can benefit from this.When there is more than one target in a package, the existing requirements for target sources still apply.
This change should be compatible with existing layouts as well. If there is only a single target in a package, then sources can of course continue to exist in
./Sources/<target>.Amend the
executabletemplate's generated manifest to not include thepathargument anymore.rdar://106829666