[5.5] Unify the two versions of PackageDescription into a single one using availability annotations instead of compile conditionals #3492
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
abertelrud
added
5.5
ready
|
@swift-ci please test |
tomerd
approved these changes
May 13, 2021
abertelrud
force-pushed
the
eng/unified-package-description-5.5
branch
from
45094d3 to
66e4f80
Compare
…using availability annotations instead of #if Unify PackageDescription 4.0 and 4.2+ into a single library by using availability annotations instead of #if Replace the compile-time conditionals in PackageDescription with availability annotations. This lets us build a single PackageDescription, which will make the build scripts easier (with the goal of being able to build it entirely from the package itself). As part of this we also clean up the runtime library subdirectories. Until now we've had PackagePlugin directly in the runtime library directory, and PackageDescription under subdirectories called "4" and "4_2". This has sufficed in keeping PackageDescription and PackagePlugin in separate directories (so that a manifest or plugin script can't import both). This needs to be changed now that there is only one version of a PackageDescription, and anyway it's time to clean this up. So as part of this we also establish two subdirectories for the runtime APIs: "ManifestAPI" and "PluginAPI". If we add more kinds of scripts, we can then add new subdirectories here. rdar://77441062 (cherry picked from 2d2b387)
abertelrud
force-pushed
the
eng/unified-package-description-5.5
branch
from
66e4f80 to
6c70d17
Compare
|
This PR has been up for a long time, so I rebased on the latest |
|
@swift-ci please test |
abertelrud
added a commit
to abertelrud/swift-package-manager
that referenced
this pull request
Jun 15, 2021
…a single library by using availability annotations instead of #if (swiftlang#3492)" This caused the Windows toolchains to break, so this temporarily reverts the change until the installer can be adjusted. This reverts commit d875e4f.
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.
This is a SwiftPM 5.5 nomination of #3464. Some of the fixes we still want to do in 5.5 (such as building the toolchains with universal binaries for PackageDescription and PackagePlugin on Darwin) require this change (since SwiftPM cannot currently build the same target in two different ways, i.e. cannot product a 4.0 and 4.2 PackageDescription).