Skip to content

Commit 12f30ea

Browse files
committed
WiX: add swiftToCxx content to the toolchain distribution
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
1 parent dcca959 commit 12f30ea

File tree

2 files changed

+24
-0
lines changed

2 files changed

+24
-0
lines changed

platforms/Windows/toolchain-amd64.wxs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@
8787
</Directory>
8888
</Directory>
8989
<Directory Id="_usr_lib_swift" Name="swift">
90+
<Directory Id="_usr_lib_swift_swiftToCxx" Name="swiftToCxx">
91+
</Directory>
9092
<Directory Id="_usr_lib_swift_migrator" Name="migrator">
9193
</Directory>
9294
<Directory Id="_usr_lib_swift_shims" Name="shims">
@@ -600,6 +602,16 @@
600602
<File Id="_InternalSwiftScan.modulemap" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\_InternalSwiftScan\module.modulemap" Checksum="yes" />
601603
</Component>
602604

605+
<Component Id="_SwiftCxxInteroperability.h" Directory="_usr_lib_swift_swiftToCxx" Guid="8c1ba49d-9d1e-4f40-8464-0d4126de6ce6">
606+
<File Id="_SwiftCxxInteroperability.h" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\_SwiftCxxInteroperability.h" Checksum="yes" />
607+
</Component>
608+
<Component Id="_SwiftStdlibCxxOverlay.h" Directory="_usr_lib_swift_swiftToCxx" Guid="05d867e2-da43-49b1-8cf5-3b4daa76773c">
609+
<File Id="_SwiftStdlibCxxOverlay.h" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\_SwiftStdlibCxxOverlay.h" Checksum="yes" />
610+
</Component>
611+
<Component Id="experimental_interoperability_version.json" Directory="_usr_lib_swift_swiftToCxx" Guid="e2bfde07-43b9-4fe6-9d4a-87d2412349b8">
612+
<File Id="experimental_interoperability_version.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\experimental-interoperability-version.json" Checksum="yes" />
613+
</Component>
614+
603615
<Component Id="ios4.json" Directory="_usr_lib_swift_migrator" Guid="86db2678-9f8b-446e-bfbc-eb45e725420e">
604616
<File Id="ios4.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\ios4.json" Checksum="yes" />
605617
</Component>

platforms/Windows/toolchain-arm64.wxs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@
8787
</Directory>
8888
</Directory>
8989
<Directory Id="_usr_lib_swift" Name="swift">
90+
<Directory Id="_usr_lib_swift_swiftToCxx" Name="swiftToCxx">
91+
</Directory>
9092
<Directory Id="_usr_lib_swift_migrator" Name="migrator">
9193
</Directory>
9294
<Directory Id="_usr_lib_swift_shims" Name="shims">
@@ -600,6 +602,16 @@
600602
<File Id="_InternalSwiftScan.modulemap" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\_InternalSwiftScan\module.modulemap" Checksum="yes" />
601603
</Component>
602604

605+
<Component Id="_SwiftCxxInteroperability.h" Directory="_usr_lib_swift_swiftToCxx" Guid="8c1ba49d-9d1e-4f40-8464-0d4126de6ce6">
606+
<File Id="_SwiftCxxInteroperability.h" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\_SwiftCxxInteroperability.h" Checksum="yes" />
607+
</Component>
608+
<Component Id="_SwiftStdlibCxxOverlay.h" Directory="_usr_lib_swift_swiftToCxx" Guid="05d867e2-da43-49b1-8cf5-3b4daa76773c">
609+
<File Id="_SwiftStdlibCxxOverlay.h" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\_SwiftStdlibCxxOverlay.h" Checksum="yes" />
610+
</Component>
611+
<Component Id="experimental_interoperability_version.json" Directory="_usr_lib_swift_swiftToCxx" Guid="e2bfde07-43b9-4fe6-9d4a-87d2412349b8">
612+
<File Id="experimental_interoperability_version.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\experimental-interoperability-version.json" Checksum="yes" />
613+
</Component>
614+
603615
<Component Id="ios4.json" Directory="_usr_lib_swift_migrator" Guid="86db2678-9f8b-446e-bfbc-eb45e725420e">
604616
<File Id="ios4.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\ios4.json" Checksum="yes" />
605617
</Component>

0 commit comments

Comments
 (0)