From e7c17b169506f11002c52d7e199b50f95103cb75 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Tue, 29 Aug 2023 14:10:46 -0400
Subject: [PATCH] Add checkboxes per SDK for redist MSMs.

Also disable modify button in ARP.
---
 platforms/Windows/bundle/installer.wxs   | 7 +++++++
 platforms/Windows/bundle/theme.xml       | 9 ++++++---
 platforms/Windows/sdk/sdk.wxs            | 2 +-
 platforms/Windows/shared/swift.en-us.wxl | 3 +++
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs
index 5fbdb089..eeb544f5 100644
--- a/platforms/Windows/bundle/installer.wxs
+++ b/platforms/Windows/bundle/installer.wxs
@@ -3,6 +3,7 @@
     Name="!(loc.BundleName) $(ProductVersion)"
     Version="$(ProductVersion)"
     Manufacturer="!(loc.ManufacturerName)"
+    DisableModify="yes"
     Compressed="$(IsBundleCompressed)"
     UpgradeCode="$(BundleUpgradeCode)">
 
@@ -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.
@@ -95,6 +99,7 @@
           InstallCondition="OptionsInstallSdkX86"
           DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
           <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
+          <MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallRedistX86]" />
         </MsiPackage>
       <?endif?>
 
@@ -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 ?>
@@ -111,6 +117,7 @@
           InstallCondition="OptionsInstallSdkArm64"
           DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
           <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
+          <MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallRedistArm64]" />
         </MsiPackage>
       <?endif?>
      </Chain>
diff --git a/platforms/Windows/bundle/theme.xml b/platforms/Windows/bundle/theme.xml
index 502b8f4b..3885361f 100644
--- a/platforms/Windows/bundle/theme.xml
+++ b/platforms/Windows/bundle/theme.xml
@@ -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>
diff --git a/platforms/Windows/sdk/sdk.wxs b/platforms/Windows/sdk/sdk.wxs
index 2cc21307..98640501 100644
--- a/platforms/Windows/sdk/sdk.wxs
+++ b/platforms/Windows/sdk/sdk.wxs
@@ -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>
 
diff --git a/platforms/Windows/shared/swift.en-us.wxl b/platforms/Windows/shared/swift.en-us.wxl
index 79313889..e5da9f3b 100644
--- a/platforms/Windows/shared/swift.en-us.wxl
+++ b/platforms/Windows/shared/swift.en-us.wxl
@@ -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]" />