From 475fc855b2ec523c7739d6c7cb5b757aac9aa719 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Thu, 29 Dec 2022 18:33:28 -0800
Subject: [PATCH] WiX: shuffle around non-llbuild components

Move the import libraries for other components into the appropriate
component groups.  This cleans up the llbuild component.
---
 platforms/Windows/toolchain-amd64.wxs | 26 ++++++++++++++------------
 platforms/Windows/toolchain-arm64.wxs | 26 ++++++++++++++------------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/platforms/Windows/toolchain-amd64.wxs b/platforms/Windows/toolchain-amd64.wxs
index f75b8853..6d0a4d9a 100644
--- a/platforms/Windows/toolchain-amd64.wxs
+++ b/platforms/Windows/toolchain-amd64.wxs
@@ -496,7 +496,11 @@
         <File Id="BlocksRuntime.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\BlocksRuntime.dll" Checksum="yes" />
       </Component>
 
-      <!-- TODO(compnerd) should we install the block headers and import libraries? -->
+      <Component Id="BlocksRuntime.lib" Directory="_usr_lib" Guid="b758a96a-644b-421d-a668-2ba2b55601aa">
+        <File Id="BlocksRuntime.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\BlocksRuntime.lib" Checksum="yes" />
+      </Component>
+
+      <!-- TODO(compnerd) should we install the block headers? -->
     </ComponentGroup>
 
     <?ifdef INCLUDE_DEBUG_INFO ?>
@@ -512,7 +516,11 @@
         <File Id="dispatch.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\dispatch.dll" Checksum="yes" />
       </Component>
 
-      <!-- TODO(compnerd) should we install the dispatch headers and import libraries? -->
+      <Component Id="dispatch.lib" Directory="_usr_lib" Guid="b5d342d2-fc9a-46e5-93ac-1781e2055ac4">
+        <File Id="dispatch.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\dispatch.lib" Checksum="yes" />
+      </Component>
+
+      <!-- TODO(compnerd) should we install the dispatch headers? -->
     </ComponentGroup>
 
     <?ifdef INCLUDE_DEBUG_INFO ?>
@@ -528,6 +536,10 @@
         <File Id="sourcekitdInProc.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\sourcekitdInProc.dll" Checksum="yes" />
       </Component>
 
+      <Component Id="sourcekitdInProc.lib" Directory="_usr_lib" Guid="cd564210-c471-478e-b1c4-d6a35fc6572f">
+        <File Id="sourcekitdInProc.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\sourcekitdInProc.lib" Checksum="yes" />
+      </Component>
+
       <Component Id="sourcekitd.h" Directory="_usr_include_SourceKit" Guid="bdb02d6c-b3f7-4109-bd41-fc04734484a4">
         <File Id="sourcekitd.h" Source="$(var.TOOLCHAIN_ROOT)\usr\include\SourceKit\sourcekitd.h" Checksum="yes" />
       </Component>
@@ -649,16 +661,6 @@
       <Component Id="llbuildSwift.dll" Directory="_usr_bin" Guid="4386ca67-150b-424f-a699-7029f41746d5">
         <File Id="llbuildSwift.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\llbuildSwift.dll" Checksum="yes" />
       </Component>
-
-      <Component Id="BlocksRuntime.lib" Directory="_usr_lib" Guid="b758a96a-644b-421d-a668-2ba2b55601aa">
-        <File Id="BlocksRuntime.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\BlocksRuntime.lib" Checksum="yes" />
-      </Component>
-      <Component Id="dispatch.lib" Directory="_usr_lib" Guid="b5d342d2-fc9a-46e5-93ac-1781e2055ac4">
-        <File Id="dispatch.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\dispatch.lib" Checksum="yes" />
-      </Component>
-      <Component Id="sourcekitdInProc.lib" Directory="_usr_lib" Guid="cd564210-c471-478e-b1c4-d6a35fc6572f">
-        <File Id="sourcekitdInProc.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\sourcekitdInProc.lib" Checksum="yes" />
-      </Component>
     </ComponentGroup>
 
     <?ifdef INCLUDE_DEBUG_INFO ?>
diff --git a/platforms/Windows/toolchain-arm64.wxs b/platforms/Windows/toolchain-arm64.wxs
index 798bab88..7f28408d 100644
--- a/platforms/Windows/toolchain-arm64.wxs
+++ b/platforms/Windows/toolchain-arm64.wxs
@@ -496,7 +496,11 @@
         <File Id="BlocksRuntime.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\BlocksRuntime.dll" Checksum="yes" />
       </Component>
 
-      <!-- TODO(compnerd) should we install the block headers and import libraries? -->
+      <Component Id="BlocksRuntime.lib" Directory="_usr_lib" Guid="33221a05-d071-432c-b9a1-196b14d2ea19">
+        <File Id="BlocksRuntime.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\BlocksRuntime.lib" Checksum="yes" />
+      </Component>
+
+      <!-- TODO(compnerd) should we install the block headers? -->
     </ComponentGroup>
 
     <?ifdef INCLUDE_DEBUG_INFO ?>
@@ -512,7 +516,11 @@
         <File Id="dispatch.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\dispatch.dll" Checksum="yes" />
       </Component>
 
-      <!-- TODO(compnerd) should we install the dispatch headers and import libraries? -->
+      <Component Id="dispatch.lib" Directory="_usr_lib" Guid="5a001bb8-4557-41eb-8d2d-38870cd2e9dc">
+        <File Id="dispatch.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\dispatch.lib" Checksum="yes" />
+      </Component>
+
+      <!-- TODO(compnerd) should we install the dispatch headers? -->
     </ComponentGroup>
 
     <?ifdef INCLUDE_DEBUG_INFO ?>
@@ -528,6 +536,10 @@
         <File Id="sourcekitdInProc.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\sourcekitdInProc.dll" Checksum="yes" />
       </Component>
 
+      <Component Id="sourcekitdInProc.lib" Directory="_usr_lib" Guid="f95bebbf-15ec-4cd5-9d1f-dd831ce34a9d">
+        <File Id="sourcekitdInProc.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\sourcekitdInProc.lib" Checksum="yes" />
+      </Component>
+
       <Component Id="sourcekitd.h" Directory="_usr_include_SourceKit" Guid="bdb02d6c-b3f7-4109-bd41-fc04734484a4">
         <File Id="sourcekitd.h" Source="$(var.TOOLCHAIN_ROOT)\usr\include\SourceKit\sourcekitd.h" Checksum="yes" />
       </Component>
@@ -649,16 +661,6 @@
       <Component Id="llbuildSwift.dll" Directory="_usr_bin" Guid="93fd1e4e-7b70-4440-93fb-0889e50840f3">
         <File Id="llbuildSwift.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\llbuildSwift.dll" Checksum="yes" />
       </Component>
-
-      <Component Id="BlocksRuntime.lib" Directory="_usr_lib" Guid="33221a05-d071-432c-b9a1-196b14d2ea19">
-        <File Id="BlocksRuntime.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\BlocksRuntime.lib" Checksum="yes" />
-      </Component>
-      <Component Id="dispatch.lib" Directory="_usr_lib" Guid="5a001bb8-4557-41eb-8d2d-38870cd2e9dc">
-        <File Id="dispatch.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\dispatch.lib" Checksum="yes" />
-      </Component>
-      <Component Id="sourcekitdInProc.lib" Directory="_usr_lib" Guid="f95bebbf-15ec-4cd5-9d1f-dd831ce34a9d">
-        <File Id="sourcekitdInProc.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\sourcekitdInProc.lib" Checksum="yes" />
-      </Component>
     </ComponentGroup>
 
     <?ifdef INCLUDE_DEBUG_INFO ?>