From 23c2d4ea1e3c71744ba6c43fe4e11ff00bcacb45 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <abdulras@thebrowser.company>
Date: Tue, 29 Aug 2023 07:20:08 -0700
Subject: [PATCH] WiX: handle all installed architectures similarly

Treat all architectures equally and provide an option for all of them.
This allows us to programmatically invoke the build target with the
correct set of flags.
---
 platforms/Windows/bundle/installer.wixproj | 12 ++++++++----
 platforms/Windows/bundle/installer.wxs     | 22 ++++++++++++----------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/platforms/Windows/bundle/installer.wixproj b/platforms/Windows/bundle/installer.wixproj
index 0e8d95cb..4aff19b9 100644
--- a/platforms/Windows/bundle/installer.wixproj
+++ b/platforms/Windows/bundle/installer.wixproj
@@ -4,8 +4,9 @@
     <DefaultCompressionLevel>$(BundleCompressionLevel)</DefaultCompressionLevel>
     <DefineConstants>
       $(DefineConstants);
-      INCLUDE_X86_SDK=$(INCLUDE_X86_SDK);
+      INCLUDE_AMD64_SDK=$(INCLLUDE_AMD64_SDK);
       INCLUDE_ARM64_SDK=$(INCLUDE_ARM64_SDK);
+      INCLUDE_X86_SDK=$(INCLUDE_X86_SDK);
     </DefineConstants>
   </PropertyGroup>
 
@@ -19,14 +20,17 @@
     <ProjectReference Include="..\dbg\dbg.wixproj" BindName="dbg" />
     <ProjectReference Include="..\ide\ide.wixproj" BindName="ide" />
     <ProjectReference Include="..\rtl\msi\rtlmsi.wixproj" BindName="rtl" />
-    <ProjectReference Include="..\sdk\sdk.wixproj" Properties="ProductArchitecture=amd64;Platform=x86" BindName="sdk_amd64" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(INCLUDE_X86_SDK)' != '' ">
-    <ProjectReference Include="..\sdk\sdk.wixproj" Properties="ProductArchitecture=x86;Platform=x86" BindName="sdk_x86" />
+  <ItemGroup Condition=" '$(INCLUDE_AMD64_SDK)' != '' ">
+    <ProjectReference Include="..\sdk\sdk.wixproj" Properties="ProductArchitecture=amd64;Platform=x86" BindName="sdk_amd64" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(INCLUDE_ARM64_SDK)' != '' ">
     <ProjectReference Include="..\sdk\sdk.wixproj" Properties="ProductArchitecture=arm64;Platform=x86" BindName="sdk_arm64" />
   </ItemGroup>
+
+  <ItemGroup Condition=" '$(INCLUDE_X86_SDK)' != '' ">
+    <ProjectReference Include="..\sdk\sdk.wixproj" Properties="ProductArchitecture=x86;Platform=x86" BindName="sdk_x86" />
+  </ItemGroup>
 </Project>
diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs
index 5fbdb089..55f3dbc8 100644
--- a/platforms/Windows/bundle/installer.wxs
+++ b/platforms/Windows/bundle/installer.wxs
@@ -89,22 +89,15 @@
         <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
       </MsiPackage>
 
-      <?if $(INCLUDE_X86_SDK) == true?>
+      <?if $(INCLUDE_AMD64_SDK) == true ?>
         <MsiPackage
-          SourceFile="!(bindpath.sdk_x86)\sdk.x86.msi"
-          InstallCondition="OptionsInstallSdkX86"
+          SourceFile="!(bindpath.sdk_amd64)\sdk.amd64.msi"
+          InstallCondition="OptionsInstallSdkAMD64"
           DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
           <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
         </MsiPackage>
       <?endif?>
 
-      <MsiPackage
-        SourceFile="!(bindpath.sdk_amd64)\sdk.amd64.msi"
-        InstallCondition="OptionsInstallSdkAMD64"
-        DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
-        <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
-      </MsiPackage>
-
       <?if $(INCLUDE_ARM64_SDK) == true ?>
         <MsiPackage
           SourceFile="!(bindpath.sdk_arm64)\sdk.arm64.msi"
@@ -113,6 +106,15 @@
           <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
         </MsiPackage>
       <?endif?>
+
+      <?if $(INCLUDE_X86_SDK) == true?>
+        <MsiPackage
+          SourceFile="!(bindpath.sdk_x86)\sdk.x86.msi"
+          InstallCondition="OptionsInstallSdkX86"
+          DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
+          <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
+        </MsiPackage>
+      <?endif?>
      </Chain>
   </Bundle>
 </Wix>