Skip to content

Commit

Permalink
WiX: add swiftToCxx content to the toolchain distribution
Browse files Browse the repository at this point in the history 
Include the `swiftToCxx` content as compiler resources for the Swift
compiler for the distribution.  This is part oft the C++ interop work.

Fixes: swiftlang/swift#63446
  • Loading branch information
@compnerd
compnerd committed May 17, 2023
1 parent dcca959 commit 12f30ea
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
12 changes: 12 additions & 0 deletions platforms/Windows/toolchain-amd64.wxs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@
</Directory>
</Directory>
<Directory Id="_usr_lib_swift" Name="swift">
<Directory Id="_usr_lib_swift_swiftToCxx" Name="swiftToCxx">
</Directory>
<Directory Id="_usr_lib_swift_migrator" Name="migrator">
</Directory>
<Directory Id="_usr_lib_swift_shims" Name="shims">
Expand Down Expand Up @@ -600,6 +602,16 @@
<File Id="_InternalSwiftScan.modulemap" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\_InternalSwiftScan\module.modulemap" Checksum="yes" />
</Component>

<Component Id="_SwiftCxxInteroperability.h" Directory="_usr_lib_swift_swiftToCxx" Guid="8c1ba49d-9d1e-4f40-8464-0d4126de6ce6">
<File Id="_SwiftCxxInteroperability.h" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\_SwiftCxxInteroperability.h" Checksum="yes" />
</Component>
<Component Id="_SwiftStdlibCxxOverlay.h" Directory="_usr_lib_swift_swiftToCxx" Guid="05d867e2-da43-49b1-8cf5-3b4daa76773c">
<File Id="_SwiftStdlibCxxOverlay.h" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\_SwiftStdlibCxxOverlay.h" Checksum="yes" />
</Component>
<Component Id="experimental_interoperability_version.json" Directory="_usr_lib_swift_swiftToCxx" Guid="e2bfde07-43b9-4fe6-9d4a-87d2412349b8">
<File Id="experimental_interoperability_version.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\experimental-interoperability-version.json" Checksum="yes" />
</Component>

<Component Id="ios4.json" Directory="_usr_lib_swift_migrator" Guid="86db2678-9f8b-446e-bfbc-eb45e725420e">
<File Id="ios4.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\ios4.json" Checksum="yes" />
</Component>
Expand Down
12 changes: 12 additions & 0 deletions platforms/Windows/toolchain-arm64.wxs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@
</Directory>
</Directory>
<Directory Id="_usr_lib_swift" Name="swift">
<Directory Id="_usr_lib_swift_swiftToCxx" Name="swiftToCxx">
</Directory>
<Directory Id="_usr_lib_swift_migrator" Name="migrator">
</Directory>
<Directory Id="_usr_lib_swift_shims" Name="shims">
Expand Down Expand Up @@ -600,6 +602,16 @@
<File Id="_InternalSwiftScan.modulemap" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\_InternalSwiftScan\module.modulemap" Checksum="yes" />
</Component>

<Component Id="_SwiftCxxInteroperability.h" Directory="_usr_lib_swift_swiftToCxx" Guid="8c1ba49d-9d1e-4f40-8464-0d4126de6ce6">
<File Id="_SwiftCxxInteroperability.h" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\_SwiftCxxInteroperability.h" Checksum="yes" />
</Component>
<Component Id="_SwiftStdlibCxxOverlay.h" Directory="_usr_lib_swift_swiftToCxx" Guid="05d867e2-da43-49b1-8cf5-3b4daa76773c">
<File Id="_SwiftStdlibCxxOverlay.h" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\_SwiftStdlibCxxOverlay.h" Checksum="yes" />
</Component>
<Component Id="experimental_interoperability_version.json" Directory="_usr_lib_swift_swiftToCxx" Guid="e2bfde07-43b9-4fe6-9d4a-87d2412349b8">
<File Id="experimental_interoperability_version.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\experimental-interoperability-version.json" Checksum="yes" />
</Component>

<Component Id="ios4.json" Directory="_usr_lib_swift_migrator" Guid="86db2678-9f8b-446e-bfbc-eb45e725420e">
<File Id="ios4.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\ios4.json" Checksum="yes" />
</Component>
Expand Down

0 comments on commit 12f30ea

Please sign in to comment.