[6.1] Merge main into 6.1 to pick up recent fixes #359
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
bnbarham
requested review from
shahmishal,
compnerd and
etcwilde
as code owners
compnerd
approved these changes
Jan 2, 2025
etcwilde
approved these changes
Jan 2, 2025
|
Cross-PR testing in swiftlang/swift#78415 |
Treat all architectures equally and provide an option for all of them. This allows us to programmatically invoke the build target with the correct set of flags.
As the Windows build has evolved, we have built up a complete toolchain image and removed the need for the separate `DEVTOOLS_ROOT`. This simplifies the packaging manifest and associated MSBuild files.
We cannot build DocC everywhere yet (primarily Windows ARM64 cannot be built due to the use of SPM). Document the properties that we use to control the packaging with regards to DocC.
We now can always build swift-inspect, remove the option to exclude swift-inspect. Shuffle the tool into the main toolchain installation and remove the additional support that the fragmented swift-inspect handling required.
Uniformly use `sdk.[os].[arch].{msi,cab}` for the name of the files and
`INCLUDE_[os]_[arch]_SDK` to indicate that the SDK should be included.
This makes both Windows and Android similar in their handling and
naming.
Case-sensitively match the checkbox names (in theme.xml) and the variable names (in installer.wxs) so that the command line options like "OptionsInstallIDE=0" work.
Add a hierarchy for the SDKs as there are now two platforms that we are packaging. This makes the structure easier to follow and adopts a similar naming scheme.
Properties defined in `shared.wixproj` are used in the Android SDK packaging project.
bnbarham
force-pushed
the
merge-main-6.1
branch
from
7e6607f to
8db8df4
Compare
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.
We mostly want 345b660, but the rest all seem reasonable as well.