WiX: restructure the Windows installer #413
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
The import libraries are architecture specific. As we do not currently merge the import libraries, we embed them into an architecture specific directory. This adjusts the lookup path as we have started moving the files rather than copying them. This makes the installer packaging more strict about expecting the path to the final destination.
This restructures the Windows installer components to the following: - bld - cli - dbg - ide - rtl The SDKs for the various platforms have now been removed and replaced with the new platforms packages. There are currently two of them: - android - windows Each one of these platform support packages support a set of architectures relevant to the OS. The platform MSI installs the shared view of the platform support, and each architecture slice adds the support for the specified architecture. The parameters to the installer build have now been replaced with the single root path to the toolchain image and a set of paths for the Windows runtime installations to package. This is critical to resolving the previous issue with the unified installer build: we would clobber the paths as there was no android and windows platform differentiation. The changes removed the need for the variants of the shared library as all the architectures are now included into a single MSI, simply split up amongst the CABs.
- Correct the case for the XCTest inclusion check - Correct indentation for DS2 inclusion - Correct feature names for architecture support - Correct media IDs for certain architectures - Correct directories for certain files - Correct names for certain directories
- `True` is the proper boolean value for the msbuild preprocessor - `InstallAMD64SDK` is the proper name for the Android x64 SDK condition
shahmishal
approved these changes
Apr 24, 2025
Steelskin
pushed a commit
to compnerd/swift-build
that referenced
this pull request
Apr 28, 2025
This updates the packaging steps following swiftlang/swift-installer-scripts#413 This cherry-picks the following PRs: * GHA: shuffle the Foundation headers #918 * GHA: shuffle more files for Dispatch, Foundation #935 * Create directory before moving items #936 * GHA: adjust the installer build phases #937 * GHA: enable _Builtin_float on android #942 * Installer: Properly include Android platform #944 * Update Android root folder #943 * Packaging: Set productArchitecture #941 * Android: Update Android platform packaging #940
Steelskin
added a commit
to compnerd/swift-build
that referenced
this pull request
Apr 29, 2025
This updates the packaging steps following swiftlang/swift-installer-scripts#413 This cherry-picks the following PRs: * GHA: shuffle the Foundation headers #918 * GHA: shuffle more files for Dispatch, Foundation #935 * Create directory before moving items #936 * GHA: adjust the installer build phases #937 * GHA: enable _Builtin_float on android #942 * Installer: Properly include Android platform #944 * Update Android root folder #943 * Packaging: Set productArchitecture #941 * Android: Update Android platform packaging #940 Co-authored-by: Saleem Abdulrasool <[email protected]>
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 restructures the Windows installer components to the following:
The SDKs for the various platforms have now been removed and replaced
with the new platforms packages. There are currently two of them:
Each one of these platform support packages support a set of
architectures relevant to the OS. The platform MSI installs the shared
view of the platform support, and each architecture slice adds the
support for the specified architecture.
The parameters to the installer build have now been replaced with the
single root path to the toolchain image and a set of paths for the
Windows runtime installations to package. This is critical to resolving
the previous issue with the unified installer build: we would clobber
the paths as there was no android and windows platform differentiation.
The changes removed the need for the variants of the shared library as
all the architectures are now included into a single MSI, simply split
up amongst the CABs.