WiX: adjust packaging for DocC

In order to prepare for DocC being consumed by SourceKit-LSP, we are
building SwiftDocC as a shared library and docc links against it. Adjust
the packaging rules accordingly.

Additionally, make DocC a required component. This adopting CMake can
allow this being a required portion of the toolchain distribution.

Author: compnerd

platforms/Windows/cli/asserts/cli.asserts.wixproj

@@ -2,9 +2,6 @@
   <PropertyGroup>
     <DefineConstants>
       $(DefineConstants);
-      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>
     <OutputName>cli.asserts</OutputName>
@@ -14,9 +11,9 @@
     <PackageReference Include="WixToolset.Heat" Version="4.0.5" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(INCLUDE_SWIFT_DOCC)' == 'True' ">
+  <ItemGroup>
     <HarvestDirectory Include="$(SWIFT_DOCC_RENDER_ARTIFACT_ROOT)\dist">
-      <ComponentGroupName>DocCRender_asserts</ComponentGroupName>
+      <ComponentGroupName>DocCRender</ComponentGroupName>
       <DirectoryRefId>toolchain_asserts_usr_share_docc_render</DirectoryRefId>
       <PreprocessorVariable>var.SWIFT_DOCC_RENDER_ARTIFACT_ROOT_DIST</PreprocessorVariable>
       <SuppressCom>true</SuppressCom>

platforms/Windows/cli/cli.wxi

@@ -723,11 +723,9 @@
     </ComponentGroup>
 
     <ComponentGroup Id="DocC" Directory="toolchain_$(VariantName)_usr_bin">
-      <?if $(INCLUDE_SWIFT_DOCC) = True?>
-        <Component>
-          <File Source="$(SWIFT_DOCC_BUILD)\docc.exe" />
-        </Component>
-      <?endif?>
+      <Component>
+        <File Source="$(ToolchainRoot)\usr\bin\docc.exe" />
+      </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="swift_format" Directory="toolchain_$(VariantName)_usr_bin">
@@ -756,9 +754,7 @@
       <ComponentGroupRef Id="PackagePlugin" />
 
       <ComponentGroupRef Id="DocC" />
-      <?if $(INCLUDE_SWIFT_DOCC) = True?>
-        <ComponentGroupRef Id="DocCRender_$(VariantName)" />
-      <?endif?>
+      <ComponentGroupRef Id="DocCRender" />
 
       <ComponentGroupRef Id="swift_format" />
 

platforms/Windows/cli/noasserts/cli.noasserts.wixproj

@@ -2,9 +2,6 @@
   <PropertyGroup>
     <DefineConstants>
       $(DefineConstants);
-      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>
     <OutputName>cli.noasserts</OutputName>
@@ -14,9 +11,9 @@
     <PackageReference Include="WixToolset.Heat" Version="4.0.5" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(INCLUDE_SWIFT_DOCC)' == 'True' ">
+  <ItemGroup>
     <HarvestDirectory Include="$(SWIFT_DOCC_RENDER_ARTIFACT_ROOT)\dist">
-      <ComponentGroupName>DocCRender_noasserts</ComponentGroupName>
+      <ComponentGroupName>DocCRender</ComponentGroupName>
       <DirectoryRefId>toolchain_noasserts_usr_share_docc_render</DirectoryRefId>
       <PreprocessorVariable>var.SWIFT_DOCC_RENDER_ARTIFACT_ROOT_DIST</PreprocessorVariable>
       <SuppressCom>true</SuppressCom>