Skip to content

WiX: enable bootstrapping #531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
compnerd merged 3 commits into from
Jun 17, 2026
Merged

WiX: enable bootstrapping #531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21fae8c
WiX: drop legacy SDK, promote experimental packaging
compnerd May 19, 2026
cfbdd2e
WiX: package SxS runtime for toolchain
compnerd May 20, 2026
51b9b5a
WiX: update locations for bootstrapped toolchain
compnerd May 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions platforms/Windows/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@
<PropertyGroup Condition=" '$(ProductArchitecture)' == 'x86' ">
<Platform>x86</Platform>
</PropertyGroup>
<PropertyGroup Condition=" '$(IncludeLegacySDK)' == '' ">
<IncludeLegacySDK>true</IncludeLegacySDK>
</PropertyGroup>

<PropertyGroup>
<RootBuildFolder>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)build\))</RootBuildFolder>
Expand Down Expand Up @@ -88,10 +85,6 @@
WindowsRuntimeARM64=$(WindowsRuntimeARM64);
WindowsRuntimeX64=$(WindowsRuntimeX64);
WindowsRuntimeX86=$(WindowsRuntimeX86);
WindowsExperimentalRuntimeARM64=$(WindowsExperimentalRuntimeARM64);
WindowsExperimentalRuntimeX64=$(WindowsExperimentalRuntimeX64);
WindowsExperimentalRuntimeX86=$(WindowsExperimentalRuntimeX86);
IncludeLegacySDK=$(IncludeLegacySDK);
</DefineConstants>
</PropertyGroup>

Expand Down
6 changes: 2 additions & 4 deletions platforms/Windows/SideBySideUpgradeStrategy.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
<DbgNoAssertsUpgradeCode>{6F26625B-7662-4631-8E0E-F2244339ED37}</DbgNoAssertsUpgradeCode>
<IdeAssertsUpgradeCode>{8DD91C86-D13D-490B-B06B-9522A9CF504C}</IdeAssertsUpgradeCode>
<IdeNoAssertsUpgradeCode>{C5519168-CF7B-4127-98B7-D886D9789B42}</IdeNoAssertsUpgradeCode>
<RtlUpgradeCode>{BEA8C6DC-F73E-445B-9486-2333D1CF2886}</RtlUpgradeCode>
<ExperimentalRTLUpgradeCode>{F9BA01C7-0C7C-4898-90BD-9D6BB308F0B3}</ExperimentalRTLUpgradeCode>
<RTLUpgradeCode>{F9BA01C7-0C7C-4898-90BD-9D6BB308F0B3}</RTLUpgradeCode>
<AndroidPlatformUpgradeCode>{313B9C1F-D5B5-4FED-B7E0-138F1EE6B26A}</AndroidPlatformUpgradeCode>
<WindowsPlatformUpgradeCode>{01AFF1CF-A025-41B6-BCBC-728D794353FD}</WindowsPlatformUpgradeCode>
<PythonUpgradeCode>{5FC42BA9-ABF5-4CCD-B93B-BDFED936BA37}</PythonUpgradeCode>
Expand Down Expand Up @@ -77,8 +76,7 @@
DbgNoAssertsUpgradeCode=$(DbgNoAssertsUpgradeCode);
IdeAssertsUpgradeCode=$(IdeAssertsUpgradeCode);
IdeNoAssertsUpgradeCode=$(IdeNoAssertsUpgradeCode);
RtlUpgradeCode=$(RtlUpgradeCode);
ExperimentalRTLUpgradeCode=$(ExperimentalRTLUpgradeCode);
RTLUpgradeCode=$(RTLUpgradeCode);
AndroidPlatformUpgradeCode=$(AndroidPlatformUpgradeCode);
WindowsPlatformUpgradeCode=$(WindowsPlatformUpgradeCode);
PythonUpgradeCode=$(PythonUpgradeCode);
Expand Down
51 changes: 47 additions & 4 deletions platforms/Windows/bld/bld.wxi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,19 @@
<WixVariable Id="SideBySidePackageUpgradeCode" Value="$(VariantUpgradeCode)" />
<FeatureGroupRef Id="SideBySideUpgradeStrategy" />

<DirectoryRef Id="toolchain_$(VariantName)_usr_bin">
<Directory Id="toolchain_$(VariantName)_usr_bin_dispatch" Name="dispatch" />
<Directory Id="toolchain_$(VariantName)_usr_bin_FoundationEssentials" Name="FoundationEssentials" />
<Directory Id="toolchain_$(VariantName)_usr_bin_swift_Concurrency" Name="swift_Concurrency" />
<Directory Id="toolchain_$(VariantName)_usr_bin_swift_StringProcessing" Name="swift_StringProcessing" />
<Directory Id="toolchain_$(VariantName)_usr_bin_swiftCore" Name="swiftCore" />
<Directory Id="toolchain_$(VariantName)_usr_bin_swiftCRT" Name="swiftCRT" />
<Directory Id="toolchain_$(VariantName)_usr_bin_swiftDispatch" Name="swiftDispatch" />
<Directory Id="toolchain_$(VariantName)_usr_bin_swiftObservation" Name="swiftObservation" />
<Directory Id="toolchain_$(VariantName)_usr_bin_swiftSynchronization" Name="swiftSynchronization" />
<Directory Id="toolchain_$(VariantName)_usr_bin_swiftWinSDK" Name="swiftWinSDK" />
</DirectoryRef>

<DirectoryRef Id="toolchain_$(VariantName)_usr_include">
<Directory Id="toolchain_$(VariantName)_usr_include_llvm_c" Name="llvm-c" />
<Directory Id="toolchain_$(VariantName)_usr_include_swift" Name="swift" />
Expand Down Expand Up @@ -225,10 +238,6 @@
</ComponentGroup>

<ComponentGroup Id="libdispatch">
<Component Directory="toolchain_$(VariantName)_usr_bin">
<File Source="$(ToolchainRoot)\usr\bin\dispatch.dll" />
</Component>

<Component Directory="toolchain_$(VariantName)_usr_lib">
<File Source="$(ToolchainRoot)\usr\lib\dispatch.lib" />
</Component>
Expand Down Expand Up @@ -542,6 +551,39 @@
</Component>
</ComponentGroup>

<ComponentGroup Id="SxSSwiftRuntime">
<Component Directory="toolchain_$(VariantName)_usr_bin_dispatch">
<File Source="$(ToolchainRoot)\usr\bin\dispatch\dispatch.dll" />
</Component>
<Component Directory="toolchain_$(VariantName)_usr_bin_FoundationEssentials">
<File Source="$(ToolchainRoot)\usr\bin\FoundationEssentials\FoundationEssentials.dll" />
</Component>
<Component Directory="toolchain_$(VariantName)_usr_bin_swift_Concurrency">
<File Source="$(ToolchainRoot)\usr\bin\swift_Concurrency\swift_Concurrency.dll" />
</Component>
<Component Directory="toolchain_$(VariantName)_usr_bin_swift_StringProcessing">
<File Source="$(ToolchainRoot)\usr\bin\swift_StringProcessing\swift_StringProcessing.dll" />
</Component>
<Component Directory="toolchain_$(VariantName)_usr_bin_swiftCore">
<File Source="$(ToolchainRoot)\usr\bin\swiftCore\swiftCore.dll" />
</Component>
<Component Directory="toolchain_$(VariantName)_usr_bin_swiftCRT">
<File Source="$(ToolchainRoot)\usr\bin\swiftCRT\swiftCRT.dll" />
</Component>
<Component Directory="toolchain_$(VariantName)_usr_bin_swiftDispatch">
<File Source="$(ToolchainRoot)\usr\bin\swiftDispatch\swiftDispatch.dll" />
</Component>
<Component Directory="toolchain_$(VariantName)_usr_bin_swiftObservation">
<File Source="$(ToolchainRoot)\usr\bin\swiftObservation\swiftObservation.dll" />
</Component>
<Component Directory="toolchain_$(VariantName)_usr_bin_swiftSynchronization">
<File Source="$(ToolchainRoot)\usr\bin\swiftSynchronization\swiftSynchronization.dll" />
</Component>
<Component Directory="toolchain_$(VariantName)_usr_bin_swiftWinSDK">
<File Source="$(ToolchainRoot)\usr\bin\swiftWinSDK\swiftWinSDK.dll" />
</Component>
</ComponentGroup>

<ComponentGroup Id="Configuration">
<Component Directory="$(ToolchainVersionedVariantDirectory)">
<File Source="$(ToolchainRoot)\ToolchainInfo.plist" />
Expand Down Expand Up @@ -574,6 +616,7 @@
<ComponentGroupRef Id="FoundationMacros" />
<ComponentGroupRef Id="TestingMacros" />
<ComponentGroupRef Id="mimalloc" />
<ComponentGroupRef Id="SxSSwiftRuntime" />

<ComponentGroupRef Id="ClangResources_$(VariantName)" />
<ComponentGroupRef Id="SwiftClangResources_$(VariantName)" />
Expand Down
4 changes: 0 additions & 4 deletions platforms/Windows/bundle/installer.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@
<ProjectReference Include="..\ide\noasserts\ide.noasserts.wixproj" BindName="ide.noasserts" />
</ItemGroup>

<ItemGroup Condition=" '$(IncludeLegacySDK)' == 'True' ">
<ProjectReference Include="..\rtl\legacy\msi\rtlmsi.wixproj" BindName="rtl" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\rtl\shared\msi\rtl.shared.msi.wixproj" Properties="ProductArchitecture=$(ProductArchitecture)" BindName="rtl.shared" />
</ItemGroup>
Expand Down
13 changes: 0 additions & 13 deletions platforms/Windows/bundle/installer.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,23 +165,13 @@
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
</MsiPackage>

<?if $(IncludeLegacySDK) == True?>
<MsiPackage
SourceFile="!(bindpath.rtl)\rtl.msi"
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
<MsiProperty Name="INSTALLSUPPORT" Value="[OptionsInstallSupport]" />
<MsiProperty Name="INSTALLUTILITIES" Value="[OptionsInstallUtilities]" />
</MsiPackage>
<?else?>
<MsiPackage
SourceFile="!(bindpath.rtl.shared)\rtl.$(ProductArchitecture).msi"
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
<MsiProperty Name="INSTALLSUPPORT" Value="[OptionsInstallSupport]" />
<MsiProperty Name="INSTALLUTILITIES" Value="[OptionsInstallUtilities]" />
</MsiPackage>
<?endif?>

<?if $(IncludeAndroid) == True?>
<MsiPackage
Expand All @@ -205,15 +195,12 @@
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />

<MsiProperty Name="INSTALLARM64SDK" Value="[OptionsInstallWindowsSDKARM64]" />
<MsiProperty Name="INSTALLARM64EXPERIMENTALSDK" Value="[OptionsInstallWindowsSDKARM64]" />
<MsiProperty Name="INSTALLARM64REDIST" Value="[OptionsInstallWindowsRedistARM64]" />

<MsiProperty Name="INSTALLAMD64SDK" Value="[OptionsInstallWindowsSDKAMD64]" />
<MsiProperty Name="INSTALLAMD64EXPERIMENTALSDK" Value="[OptionsInstallWindowsSDKAMD64]" />
<MsiProperty Name="INSTALLAMD64REDIST" Value="[OptionsInstallWindowsRedistAMD64]" />

<MsiProperty Name="INSTALLX86SDK" Value="[OptionsInstallWindowsSDKX86]" />
<MsiProperty Name="INSTALLX86EXPERIMENTALSDK" Value="[OptionsInstallWindowsSDKX86]" />
<MsiProperty Name="INSTALLX86REDIST" Value="[OptionsInstallWindowsRedistX86]" />
</MsiPackage>
<?endif?>
Expand Down
19 changes: 19 additions & 0 deletions platforms/Windows/cli/cli.wxi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@
<WixVariable Id="SideBySidePackageUpgradeCode" Value="$(VariantUpgradeCode)" />
<FeatureGroupRef Id="SideBySideUpgradeStrategy" />

<DirectoryRef Id="toolchain_$(VariantName)_usr_bin">
<Directory Id="toolchain_$(VariantName)_usr_bin_Foundation" Name="Foundation" />
<Directory Id="toolchain_$(VariantName)_usr_bin_FoundationInternationalization" Name="FoundationInternationalization" />
<Directory Id="toolchain_$(VariantName)_usr_bin__FoundationICU" Name="_FoundationICU" />
</DirectoryRef>

<DirectoryRef Id="toolchain_$(VariantName)_usr_include">
<Directory Id="toolchain_$(VariantName)_usr_include__InternalSwiftScan" Name="_InternalSwiftScan" />
<Directory Id="toolchain_$(VariantName)_usr_include_clang_c" Name="clang-c" />
Expand Down Expand Up @@ -810,6 +816,18 @@
</Component>
</ComponentGroup>

<ComponentGroup Id="SxSSwiftRuntime">
<Component Directory="toolchain_$(VariantName)_usr_bin_Foundation">
<File Source="$(ToolchainRoot)\usr\bin\Foundation\Foundation.dll" />
</Component>
<Component Directory="toolchain_$(VariantName)_usr_bin_FoundationInternationalization">
<File Source="$(ToolchainRoot)\usr\bin\FoundationInternationalization\FoundationInternationalization.dll" />
</Component>
<Component Directory="toolchain_$(VariantName)_usr_bin__FoundationICU">
<File Source="$(ToolchainRoot)\usr\bin\_FoundationICU\_FoundationICU.dll" />
</Component>
</ComponentGroup>

<Feature Id="CLITools" AllowAbsent="no" Title="$(VariantProductName)">
<ComponentGroupRef Id="clang" />
<ComponentGroupRef Id="libclang" />
Expand All @@ -833,6 +851,7 @@
<ComponentGroupRef Id="DocCRender" />

<ComponentGroupRef Id="swift_format" />
<ComponentGroupRef Id="SxSSwiftRuntime" />

<ComponentGroupRef Id="VersionedDirectoryCleanup" />
</Feature>
Expand Down
11 changes: 11 additions & 0 deletions platforms/Windows/dbg/dbg.wxi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
<WixVariable Id="SideBySidePackageUpgradeCode" Value="$(VariantUpgradeCode)" />
<FeatureGroupRef Id="SideBySideUpgradeStrategy" />

<DirectoryRef Id="toolchain_$(VariantName)_usr_bin">
<Directory Id="toolchain_$(VariantName)_usr_bin_swiftRemoteMirror" Name="swiftRemoteMirror" />
</DirectoryRef>

<DirectoryRef Id="toolchain_$(VariantName)_usr_include">
<Directory Id="toolchain_$(VariantName)_usr_include__InternalSwiftStaticMirror" Name="_InternalSwiftStaticMirror" />
</DirectoryRef>
Expand Down Expand Up @@ -139,6 +143,12 @@
</Component>
</ComponentGroup>

<ComponentGroup Id="SxSSwiftRuntime">
<Component Directory="toolchain_$(VariantName)_usr_bin_swiftRemoteMirror">
<File Source="$(ToolchainRoot)\usr\bin\swiftRemoteMirror\swiftRemoteMirror.dll" />
</Component>
</ComponentGroup>

<Feature Id="DebuggingTools" AllowAbsent="no" Title="$(VariantProductName)">
<ComponentGroupRef Id="LLDB" />
<ComponentGroupRef Id="LLDBServer" />
Expand All @@ -148,6 +158,7 @@
<ComponentGroupRef Id="SwiftSynthesizeInterface" />

<ComponentGroupRef Id="_InternalSwiftStaticMirror" />
<ComponentGroupRef Id="SxSSwiftRuntime" />

<ComponentGroupRef Id="VersionedDirectoryCleanup" />
</Feature>
Expand Down
15 changes: 15 additions & 0 deletions platforms/Windows/ide/ide.wxi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@
<WixVariable Id="SideBySidePackageUpgradeCode" Value="$(VariantUpgradeCode)" />
<FeatureGroupRef Id="SideBySideUpgradeStrategy" />

<DirectoryRef Id="toolchain_$(VariantName)_usr_bin">
<Directory Id="toolchain_$(VariantName)_usr_bin_FoundationXML" Name="FoundationXML" />
<Directory Id="toolchain_$(VariantName)_usr_bin_swiftRegexBuilder" Name="swiftRegexBuilder" />
</DirectoryRef>

<DirectoryRef Id="toolchain_$(VariantName)_usr_include">
<Directory Id="toolchain_$(VariantName)_usr_include_SourceKit" Name="SourceKit" />
</DirectoryRef>
Expand Down Expand Up @@ -65,11 +70,21 @@
</Component>
</ComponentGroup>

<ComponentGroup Id="SxSSwiftRuntime">
<Component Directory="toolchain_$(VariantName)_usr_bin_FoundationXML">
<File Source="$(ToolchainRoot)\usr\bin\FoundationXML\FoundationXML.dll" />
</Component>
<Component Directory="toolchain_$(VariantName)_usr_bin_swiftRegexBuilder">
<File Source="$(ToolchainRoot)\usr\bin\swiftRegexBuilder\swiftRegexBuilder.dll" />
</Component>
</ComponentGroup>

<Feature Id="IDETools" AllowAbsent="no" Title="$(VariantProductName)">
<ComponentGroupRef Id="clangd" />
<ComponentGroupRef Id="lldb" />
<ComponentGroupRef Id="sourcekitd" />
<ComponentGroupRef Id="lsp" />
<ComponentGroupRef Id="SxSSwiftRuntime" />

<ComponentGroupRef Id="VersionedDirectoryCleanup" />
</Feature>
Expand Down
Loading