Merge pull request #336 from swiftlang/_usr_lib_swift_clang

hyp · hyp · commit 29929f3f38ff · 2024-11-18T11:26:13.000-08:00
[windows] add usr/lib/swift/clang to the toolchain installer (cherry picked from commit 537bce7)
diff --git a/platforms/Windows/bld/bld.wixproj b/platforms/Windows/bld/bld.wixproj
@@ -5,6 +5,7 @@
       DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);
       TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);
       TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\clang;
+      TOOLCHAIN_ROOT_USR_LIB_SWIFT_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\swift\clang;
     </DefineConstants>
   </PropertyGroup>
 
@@ -22,4 +23,15 @@
       <SuppressRootDirectory>true</SuppressRootDirectory>
     </HarvestDirectory>
   </ItemGroup>
+
+  <ItemGroup>
+    <HarvestDirectory Include="$(TOOLCHAIN_ROOT)\usr\lib\swift\clang">
+      <ComponentGroupName>SwiftClangResources</ComponentGroupName>
+      <DirectoryRefId>_usr_lib_swift_clang</DirectoryRefId>
+      <PreprocessorVariable>var.TOOLCHAIN_ROOT_USR_LIB_SWIFT_CLANG</PreprocessorVariable>
+      <SuppressCom>true</SuppressCom>
+      <SuppressRegistry>true</SuppressRegistry>
+      <SuppressRootDirectory>true</SuppressRootDirectory>
+    </HarvestDirectory>
+  </ItemGroup>
 </Project>
diff --git a/platforms/Windows/bld/bld.wxs b/platforms/Windows/bld/bld.wxs
@@ -441,6 +441,7 @@
       <ComponentGroupRef Id="TestingMacros" />
 
       <ComponentGroupRef Id="ClangResources" />
+      <ComponentGroupRef Id="SwiftClangResources" />
 
       <ComponentGroupRef Id="EnvironmentVariables" />
       <ComponentGroupRef Id="VersionedDirectoryCleanup" />
diff --git a/platforms/Windows/shared/shared.wxs b/platforms/Windows/shared/shared.wxs
@@ -44,7 +44,9 @@
               <Directory Id="_usr_include" Name="include" />
               <Directory Id="_usr_lib" Name="lib">
                 <Directory Id="_usr_lib_clang" Name="clang" />
-                <Directory Id="_usr_lib_swift" Name="swift" />
+                <Directory Id="_usr_lib_swift" Name="swift">
+                  <Directory Id="_usr_lib_swift_clang" Name="clang" />
+                </Directory>
               </Directory>
               <Directory Id="_usr_share" Name="share">
                 <Directory Id="_usr_share_docc" Name="docc">
