From 3eb4acd75645e3a9b9013d118526b680c21b5c08 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <abdulras@thebrowser.company>
Date: Sat, 15 Mar 2025 17:29:26 -0700
Subject: [PATCH] WiX: adjust manifest for thick module for Dispatch

Adjust the manifest rules to account for the fact that libdispatch now
properly stages the swiftmodule in a thick module format. This avoids us
having to shuffle files around when building the installer.
---
 platforms/Windows/sdk/drd/sdk.wxs | 4 ++--
 platforms/Windows/sdk/win/sdk.wxs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/platforms/Windows/sdk/drd/sdk.wxs b/platforms/Windows/sdk/drd/sdk.wxs
index 0cf8b6e6..afd5de9b 100644
--- a/platforms/Windows/sdk/drd/sdk.wxs
+++ b/platforms/Windows/sdk/drd/sdk.wxs
@@ -226,10 +226,10 @@
         <File Source="$(SDK_ROOT)\usr\include\os\object.h" />
       </Component>
       <Component Directory="Dispatch.swiftmodule">
-        <File Name="$(Triple).swiftdoc" Source="$(SDK_ROOT)\usr\lib\swift\android\$(Architecture)\Dispatch.swiftdoc" />
+        <File Source="$(SDK_ROOT)\usr\lib\swift\android\Dispatch.swiftmodule\$(Triple).swiftdoc" />
       </Component>
       <Component Directory="Dispatch.swiftmodule">
-        <File Name="$(Triple).swiftmodule" Source="$(SDK_ROOT)\usr\lib\swift\android\$(Architecture)\Dispatch.swiftmodule" />
+        <File Source="$(SDK_ROOT)\usr\lib\swift\android\Dispatch.swiftmodule\$(Triple).swiftmodule" />
       </Component>
       <Component Directory="AndroidSDK_usr_lib_swift_android_ARCH">
         <File Source="$(SDK_ROOT)\usr\lib\swift\android\libdispatch.so" />
diff --git a/platforms/Windows/sdk/win/sdk.wxs b/platforms/Windows/sdk/win/sdk.wxs
index d7c65e42..54f5b7b0 100644
--- a/platforms/Windows/sdk/win/sdk.wxs
+++ b/platforms/Windows/sdk/win/sdk.wxs
@@ -206,10 +206,10 @@
         <File Source="$(SDK_ROOT)\usr\include\os\object.h" />
       </Component>
       <Component Directory="Dispatch.swiftmodule">
-        <File Name="$(Triple).swiftdoc" Source="$(SDK_ROOT)\usr\lib\swift\windows\$(Architecture)\Dispatch.swiftdoc" />
+        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\Dispatch.swiftmodule\$(Triple).swiftdoc" />
       </Component>
       <Component Directory="Dispatch.swiftmodule">
-        <File Name="$(Triple).swiftmodule" Source="$(SDK_ROOT)\usr\lib\swift\windows\$(Architecture)\Dispatch.swiftmodule" />
+        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\Dispatch.swiftmodule\$(Triple).swiftmodule" />
       </Component>
       <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
         <File Source="$(SDK_ROOT)\usr\lib\swift\windows\dispatch.lib" />