From f268ce13d320a288b2cfa1edb75addc57b179aa4 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <abdulras@thebrowser.company>
Date: Thu, 8 Feb 2024 07:43:57 -0800
Subject: [PATCH] WiX: require DocC for packaging the Windows toolchain

In order to save time, converting DocC to CMake shaves ~8% of the
overall Windows toolchain build time. At this point, it makes sense to
make this is a required component as it can be built with CMake.
---
 platforms/Windows/cli/cli.wixproj |  3 +--
 platforms/Windows/cli/cli.wxs     | 12 ++++--------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/platforms/Windows/cli/cli.wixproj b/platforms/Windows/cli/cli.wixproj
index b642f2d0..8abce912 100644
--- a/platforms/Windows/cli/cli.wixproj
+++ b/platforms/Windows/cli/cli.wixproj
@@ -5,7 +5,6 @@
       DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);
       TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);
       SWIFT_DOCC_BUILD=$(SWIFT_DOCC_BUILD);
-      INCLUDE_SWIFT_DOCC=$(INCLUDE_SWIFT_DOCC);
       SWIFT_FORMAT_BUILD=$(SWIFT_FORMAT_BUILD);
       SWIFT_DOCC_RENDER_ARTIFACT_ROOT_DIST=$(SWIFT_DOCC_RENDER_ARTIFACT_ROOT)\dist;
     </DefineConstants>
@@ -15,7 +14,7 @@
     <PackageReference Include="WixToolset.Heat" Version="4.0.1" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(INCLUDE_SWIFT_DOCC)' == 'true'">
+  <ItemGroup>
     <HarvestDirectory Include="$(SWIFT_DOCC_RENDER_ARTIFACT_ROOT)\dist">
       <ComponentGroupName>DocCRender</ComponentGroupName>
       <DirectoryRefId>_usr_share_docc_render</DirectoryRefId>
diff --git a/platforms/Windows/cli/cli.wxs b/platforms/Windows/cli/cli.wxs
index 0d48be14..08087778 100644
--- a/platforms/Windows/cli/cli.wxs
+++ b/platforms/Windows/cli/cli.wxs
@@ -232,11 +232,9 @@
     </ComponentGroup>
 
     <ComponentGroup Id="DocC" Directory="_usr_bin">
-      <?if $(INCLUDE_SWIFT_DOCC) == true ?>
-        <Component>
-          <File Source="$(SWIFT_DOCC_BUILD)\docc.exe" />
-        </Component>
-      <?endif?>
+      <Component>
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\docc.exe" />
+      </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="swift_format" Directory="_usr_bin">
@@ -261,9 +259,7 @@
       <ComponentGroupRef Id="package_manager" />
 
       <ComponentGroupRef Id="DocC" />
-      <?if $(INCLUDE_SWIFT_DOCC) == true ?>
-        <ComponentGroupRef Id="DocCRender" />
-      <?endif?>
+      <ComponentGroupRef Id="DocCRender" />
 
       <ComponentGroupRef Id="swift_format" />