WiX: package the experimental runtime builds

This packages the experimental runtime builds to allow us to statically
link against the standard library. This will be used to allow us to
bootstrap the early swift-driver on Windows.

Author: compnerd

platforms/Windows/bld/bld.wixproj

@@ -4,6 +4,7 @@
       $(DefineConstants);
       _USR_LIB_CLANG=$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\clang;
       _USR_LIB_SWIFT_CLANG=$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\swift\clang;
+      _USR_LIB_SWIFT_STATIC_CLANG=$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\swift_static\clang;
     </DefineConstants>
   </PropertyGroup>
 
@@ -32,4 +33,16 @@
       <SuppressRootDirectory>true</SuppressRootDirectory>
     </HarvestDirectory>
   </ItemGroup>
+
+  <ItemGroup>
+    <!-- FIXME(#81557) this needs to be properly staged once the sanitizers are included -->
+    <HarvestDirectory Include="$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\swift\clang">
+      <ComponentGroupName>SwiftStaticClangResources</ComponentGroupName>
+      <DirectoryRefId>_usr_lib_swift_static_clang</DirectoryRefId>
+      <PreprocessorVariable>var._USR_LIB_SWIFT_STATIC_CLANG</PreprocessorVariable>
+      <SuppressCom>true</SuppressCom>
+      <SuppressRegistry>true</SuppressRegistry>
+      <SuppressRootDirectory>true</SuppressRootDirectory>
+    </HarvestDirectory>
+  </ItemGroup>
 </Project>

platforms/Windows/bld/bld.wxs

@@ -572,6 +572,7 @@
 
       <ComponentGroupRef Id="ClangResources" />
       <ComponentGroupRef Id="SwiftClangResources" />
+      <ComponentGroupRef Id="SwiftStaticClangResources" />
 
       <ComponentGroupRef Id="Configuration" />
       <ComponentGroupRef Id="EnvironmentVariables" />

platforms/Windows/platforms/CDispatch.wxi

@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Component>
+  <Component DiskId="$(var.Disk)">
     <File Source="$(SDKRoot)\usr\include\dispatch\base.h" />
   </Component>
-  <Component>
+  <Component DiskId="$(var.Disk)">
     <File Source="$(SDKRoot)\usr\include\dispatch\block.h" />
   </Component>
-  <Component>
+  <Component DiskId="$(var.Disk)">
     <File Source="$(SDKRoot)\usr\include\dispatch\data.h" />
   </Component>
-  <Component>
+  <Component DiskId="$(var.Disk)">
     <File Source="$(SDKRoot)\usr\include\dispatch\dispatch.h" />
   </Component>
-  <Component>
+  <Component DiskId="$(var.Disk)">
     <File Source="$(SDKRoot)\usr\include\dispatch\group.h" />
   </Component>
-  <Component>
+  <Component DiskId="$(var.Disk)">
     <File Source="$(SDKRoot)\usr\include\dispatch\introspection.h" />
   </Component>
-  <Component>
+  <Component DiskId="$(var.Disk)">
     <File Source="$(SDKRoot)\usr\include\dispatch\io.h" />
   </Component>
-  <Component>
+  <Component DiskId="$(var.Disk)">
     <File Source="$(SDKRoot)\usr\include\dispatch\module.modulemap" />
   </Component>
-  <Component>
+  <Component DiskId="$(var.Disk)">
     <File Source="$(SDKRoot)\usr\include\dispatch\object.h" />
   </Component>
-  <Component>
+  <Component DiskId="$(var.Disk)">
     <File Source="$(SDKRoot)\usr\include\dispatch\once.h" />
   </Component>
-  <Component>
+  <Component DiskId="$(var.Disk)">
     <File Source="$(SDKRoot)\usr\include\dispatch\queue.h" />
   </Component>
-  <Component>
+  <Component DiskId="$(var.Disk)">
     <File Source="$(SDKRoot)\usr\include\dispatch\semaphore.h" />
   </Component>
-  <Component>
+  <Component DiskId="$(var.Disk)">
     <File Source="$(SDKRoot)\usr\include\dispatch\source.h" />
   </Component>
-  <Component>
+  <Component DiskId="$(var.Disk)">
     <File Source="$(SDKRoot)\usr\include\dispatch\time.h" />
   </Component>
 </Include>

platforms/Windows/platforms/_FoundationCShims.wxi

@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Component>
+  <Component DiskId="$(var.Disk)">
     <File Source="$(SDKRoot)\usr\include\_FoundationCShims\bplist_shims.h" />
   </Component>
-  <Component>
+  <Component DiskId="$(var.Disk)">
     <File Source="$(SDKRoot)\usr\include\_FoundationCShims\CFUniCharBitmapData.h" />
   </Component>
-  <Component>
+  <Component DiskId="$(var.Disk)">
     <File Source="$(SDKRoot)\usr\include\_FoundationCShims\CFUniCharBitmapData.inc.h" />
   </Component>
-  <Component>
+  <Component DiskId="$(var.Disk)">
     <File Source="$(SDKRoot)\usr\include\_FoundationCShims\filemanager_shims.h" />
   </Component>
-  <Component>
+  <Component DiskId="$(var.Disk)">
     <File Source="$(SDKRoot)\usr\include\_FoundationCShims\io_shims.h" />
   </Component>
-  <Component>
+  <Component DiskId="$(var.Disk)">
     <File Source="$(SDKRoot)\usr\include\_FoundationCShims\module.modulemap" />
   </Component>
-  <Component>
+  <Component DiskId="$(var.Disk)">
     <File Source="$(SDKRoot)\usr\include\_FoundationCShims\platform_shims.h" />
   </Component>
-  <Component>
+  <Component DiskId="$(var.Disk)">
     <File Source="$(SDKRoot)\usr\include\_FoundationCShims\string_shims.h" />
   </Component>
-  <Component>
+  <Component DiskId="$(var.Disk)">
     <File Source="$(SDKRoot)\usr\include\_FoundationCShims\uuid.h" />
   </Component>
-  <Component>
+  <Component DiskId="$(var.Disk)">
     <File Source="$(SDKRoot)\usr\include\_FoundationCShims\_CShimsMacros.h" />
   </Component>
-  <Component>
+  <Component DiskId="$(var.Disk)">
     <File Source="$(SDKRoot)\usr\include\_FoundationCShims\_CShimsTargetConditionals.h" />
   </Component>
-  <Component>
+  <Component DiskId="$(var.Disk)">
     <File Source="$(SDKRoot)\usr\include\_FoundationCShims\_CStdlib.h" />
   </Component>
-  <Component>
+  <Component DiskId="$(var.Disk)">
     <File Source="$(SDKRoot)\usr\include\_FoundationCShims\_FoundationCShims.h" />
   </Component>
 </Include>