Skip to content

WiX: ingest the MSI redistributable in the toolchain #478

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −29
Open

WiX: ingest the MSI redistributable in the toolchain #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion platforms/Windows/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,14 @@
ArePackageCabsEmbedded=$(ArePackageCabsEmbedded);
BaseReleaseDownloadUrl=$(BaseReleaseDownloadUrl);
ImageRoot=$(ImageRoot);
RedistributablesDirectory=$(RedistributablesDirectory);
IncludeLegacySDK=$(IncludeLegacySDK);
WindowsRuntimeARM64=$(WindowsRuntimeARM64);
WindowsRuntimeX64=$(WindowsRuntimeX64);
WindowsRuntimeX86=$(WindowsRuntimeX86);
WindowsExperimentalRuntimeARM64=$(WindowsExperimentalRuntimeARM64);
WindowsExperimentalRuntimeX64=$(WindowsExperimentalRuntimeX64);
WindowsExperimentalRuntimeX86=$(WindowsExperimentalRuntimeX86);
IncludeLegacySDK=$(IncludeLegacySDK);
</DefineConstants>
</PropertyGroup>

Expand Down
40 changes: 14 additions & 26 deletions platforms/Windows/bld/bld.wxi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">

<?if $(sys.BUILDARCH) == x64 ?>
<?define MergeModuleFileName = "rtl.amd64.msm" ?>
<?else?>
<?define MergeModuleFileName = "rtl.$(sys.BUILDARCH).msm" ?>
<?endif?>

<Package
Language="1033"
Manufacturer="!(loc.ManufacturerName)"
Expand Down Expand Up @@ -35,6 +41,10 @@
</Directory>
</DirectoryRef>

<DirectoryRef Id="toolchain_$(VariantName)_usr_bin">
<Merge DiskId="1" Id="swift_runtime" Language="0" SourceFile="$(RedistributablesDirectory)\$(MergeModuleFileName)" />
</DirectoryRef>

<ComponentGroup Id="cmark_gfm" Directory="toolchain_$(VariantName)_usr_bin">
<Component>
<File Source="$(ToolchainRoot)\usr\bin/cmark-gfm.dll" />
Expand Down Expand Up @@ -212,30 +222,6 @@
</Component>
</ComponentGroup>

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

<Component Directory="toolchain_$(VariantName)_usr_lib">
<File Source="$(ToolchainRoot)\usr\lib\BlocksRuntime.lib" />
</Component>

<!-- TODO(compnerd) should we install the block headers? -->
</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>

<!-- TODO(compnerd) should we install the dispatch headers? -->
</ComponentGroup>

<ComponentGroup Id="SwiftCxx" Directory="toolchain_$(VariantName)_usr_lib_swift_swiftToCxx">
<Component>
<File Source="$(ToolchainRoot)\usr\lib\swift\swiftToCxx\_SwiftCxxInteroperability.h" />
Expand Down Expand Up @@ -551,15 +537,17 @@
</Component>
</ComponentGroup>

<Feature Id="SwiftRuntimeRedistributable" Title="Swift Runtime Redistributable" AllowAdvertise="no" Display="hidden" Level="1">
<MergeRef Id="swift_runtime" />
</Feature>

<Feature Id="BuildTools" AllowAbsent="no" Title="$(VariantProductName)">
<ComponentGroupRef Id="cmark_gfm" />

<ComponentGroupRef Id="binutils" />
<ComponentGroupRef Id="lto" />
<ComponentGroupRef Id="clang" />
<ComponentGroupRef Id="lld" />
<ComponentGroupRef Id="BlocksRuntime" />
<ComponentGroupRef Id="libdispatch" />
<ComponentGroupRef Id="swift" />
<ComponentGroupRef Id="argument_parser" />
<ComponentGroupRef Id="tools_support_core" />
Expand Down
3 changes: 2 additions & 1 deletion platforms/Windows/bundle/installer.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
<Variable Name="OptionsInstallCLI" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallDBG" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallIDE" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallRTL" Value="1" />
<!-- TODO(compnerd) enable installing non-native RTL (e.g. X64 on ARM64) -->
<Variable Name="OptionsInstallRTL" bal:Overridable="yes" Persisted="yes" Value="1" />

<Variable Name="OptionsInstallUtilities" bal:Overridable="yes" Persisted="yes" Value="1" />

Expand Down
2 changes: 1 addition & 1 deletion platforms/Windows/bundle/theme.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<Checkbox Name="OptionsInstallCLI" X="192" Y="129" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Cli_ProductName)</Checkbox>
<Checkbox Name="OptionsInstallDBG" X="192" Y="147" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Dbg_ProductName)</Checkbox>
<Checkbox Name="OptionsInstallIDE" X="192" Y="165" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Ide_ProductName)</Checkbox>
<Checkbox Name="OptionsInstallRTL" X="192" Y="183" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.Rtl_ProductName)</Checkbox>
<Checkbox Name="OptionsInstallRTL" X="192" Y="183" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallRTL">#(loc.Rtl_ProductName)</Checkbox>
<Checkbox Name="OptionsInstallWindowsPlatform" X="192" Y="201" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Plt_ProductName_Windows)</Checkbox>
<Checkbox Name="OptionsInstallWindowsSDKAMD64" X="210" Y="219" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform">#(loc.Sdk_ProductName_Windows_amd64)</Checkbox>
<Checkbox Name="OptionsInstallWindowsRedistAMD64" X="228" Y="237" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform AND OptionsInstallWindowsSDKAMD64">#(loc.Redist_amd64)</Checkbox>
Expand Down