Skip to content

Add checkboxes per SDK for redist MSMs. #235

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
merged 1 commit into from
Aug 29, 2023
Merged

Add checkboxes per SDK for redist MSMs. #235

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
7 changes: 7 additions & 0 deletions platforms/Windows/bundle/installer.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
Name="!(loc.BundleName) $(ProductVersion)"
Version="$(ProductVersion)"
Manufacturer="!(loc.ManufacturerName)"
DisableModify="yes"
Compressed="$(IsBundleCompressed)"
UpgradeCode="$(BundleUpgradeCode)">

Expand Down Expand Up @@ -31,8 +32,11 @@
<Variable Name="OptionsInstallIde" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallRtl" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallSdkX86" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallRedistX86" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallSdkAMD64" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallRedistAMD64" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallSdkArm64" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallRedistArm64" bal:Overridable="yes" Persisted="yes" Value="1" />

<!--
For the online bundle, we need to provide a download URL for each package and its .cabs.
Expand Down Expand Up @@ -95,6 +99,7 @@
InstallCondition="OptionsInstallSdkX86"
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
<MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallRedistX86]" />
</MsiPackage>
<?endif?>

Expand All @@ -103,6 +108,7 @@
InstallCondition="OptionsInstallSdkAMD64"
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
<MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallRedistAMD64]" />
</MsiPackage>

<?if $(INCLUDE_ARM64_SDK) == true ?>
Expand All @@ -111,6 +117,7 @@
InstallCondition="OptionsInstallSdkArm64"
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
<MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallRedistArm64]" />
</MsiPackage>
<?endif?>
</Chain>
Expand Down
9 changes: 6 additions & 3 deletions platforms/Windows/bundle/theme.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,12 @@
<Checkbox Name="OptionsInstallDbg" X="185" Y="152" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Dbg_ProductName)</Checkbox>
<Checkbox Name="OptionsInstallIde" X="185" Y="170" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Ide_ProductName)</Checkbox>
<Checkbox Name="OptionsInstallRtl" X="185" Y="188" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Rtl_ProductName)</Checkbox>
<!-- <Checkbox Name="OptionsInstallSdkX86" X="185" Y="206" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Sdk_ProductName_x86)</Checkbox> -->
<Checkbox Name="OptionsInstallSdkAMD64" X="185" Y="224" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Sdk_ProductName_amd64)</Checkbox>
<!-- <Checkbox Name="OptionsInstallSdkArm64" X="185" Y="242" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Sdk_ProductName_arm64)</Checkbox> -->
<Checkbox Name="OptionsInstallSdkAMD64" X="185" Y="206" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Sdk_ProductName_amd64)</Checkbox>
<Checkbox Name="OptionsInstallRedistAMD64" X="203" Y="224" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallSdkAMD64">#(loc.Redist_amd64)</Checkbox>
<Checkbox Name="OptionsInstallSdkX86" X="185" Y="242" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Sdk_ProductName_x86)</Checkbox>
<Checkbox Name="OptionsInstallRedistX86" X="203" Y="260" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallSdkX86">#(loc.Redist_x86)</Checkbox>
<Checkbox Name="OptionsInstallSdkArm64" X="185" Y="278" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Sdk_ProductName_arm64)</Checkbox>
<Checkbox Name="OptionsInstallRedistArm64" X="203" Y="296" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallSdkArm64">#(loc.Redist_arm64)</Checkbox>

<Button Name="OptionsOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">
<Text>#(loc.OptionsOkButton)</Text>
Expand Down
2 changes: 1 addition & 1 deletion platforms/Windows/sdk/sdk.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@
</Component>
</ComponentGroup>

<Component Id="rtl.msm" Directory="RedistVersion">
<Component Id="rtl.msm" Directory="RedistVersion" Condition="INSTALLREDIST">
<File Source="!(bindpath.rtlmsm)\rtl.$(ProductArchitecture).msm" />
</Component>

Expand Down
3 changes: 3 additions & 0 deletions platforms/Windows/shared/swift.en-us.wxl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
<String Id="ManufacturerName" Value="swift.org" />

<String Id="OptionsFeaturesLabel" Value="Choose the features you want to install" />
<String Id="Redist_arm64" Value="Swift Windows Redistributable (ARM64)" />
<String Id="Redist_amd64" Value="Swift Windows Redistributable (AMD64)" />
<String Id="Redist_x86" Value="Swift Windows Redistributable (x86)" />

<String Id="Caption" Value="[WixBundleName] Setup" />
<String Id="Title" Value="[WixBundleName]" />
Expand Down