Skip to content

Commit 7e7c946

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 4d208a1 commit 7e7c946

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
@@ -72,6 +72,8 @@
7272
</Directory>
7373
</Directory>
7474
<Directory Id="_usr_lib_swift" Name="swift">
75+
<Directory Id="_usr_lib_swift_swiftToCxx" Name="swiftToCxx">
76+
</Directory>
7577
<Directory Id="_usr_lib_swift_migrator" Name="migrator">
7678
</Directory>
7779
<Directory Id="_usr_lib_swift_shims" Name="shims">
@@ -442,6 +444,16 @@
442444
<File Id="_InternalSwiftScan.modulemap" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\_InternalSwiftScan\module.modulemap" Checksum="yes" />
443445
</Component>
444446

447+
<Component Id="_SwiftCxxInteroperability.h" Directory="_usr_lib_swift_swiftToCxx" Guid="8c1ba49d-9d1e-4f40-8464-0d4126de6ce6">
448+
<File Id="_SwiftCxxInteroperability.h" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\_SwiftCxxInteroperability.h" Checksum="yes" />
449+
</Component>
450+
<Component Id="_SwiftStdlibCxxOverlay.h" Directory="_usr_lib_swift_swiftToCxx" Guid="05d867e2-da43-49b1-8cf5-3b4daa76773c">
451+
<File Id="_SwiftStdlibCxxOverlay.h" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\_SwiftStdlibCxxOverlay.h" Checksum="yes" />
452+
</Component>
453+
<Component Id="experimental_interoperability_version.json" Directory="_usr_lib_swift_swiftToCxx" Guid="e2bfde07-43b9-4fe6-9d4a-87d2412349b8">
454+
<File Id="experimental_interoperability_version.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\experimental-interoperability-version.json" Checksum="yes" />
455+
</Component>
456+
445457
<Component Id="ios4.json" Directory="_usr_lib_swift_migrator" Guid="86db2678-9f8b-446e-bfbc-eb45e725420e">
446458
<File Id="ios4.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\ios4.json" Checksum="yes" />
447459
</Component>

platforms/Windows/toolchain-arm64.wxs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@
7272
</Directory>
7373
</Directory>
7474
<Directory Id="_usr_lib_swift" Name="swift">
75+
<Directory Id="_usr_lib_swift_swiftToCxx" Name="swiftToCxx">
76+
</Directory>
7577
<Directory Id="_usr_lib_swift_migrator" Name="migrator">
7678
</Directory>
7779
<Directory Id="_usr_lib_swift_shims" Name="shims">
@@ -442,6 +444,16 @@
442444
<File Id="_InternalSwiftScan.modulemap" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\_InternalSwiftScan\module.modulemap" Checksum="yes" />
443445
</Component>
444446

447+
<Component Id="_SwiftCxxInteroperability.h" Directory="_usr_lib_swift_swiftToCxx" Guid="8c1ba49d-9d1e-4f40-8464-0d4126de6ce6">
448+
<File Id="_SwiftCxxInteroperability.h" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\_SwiftCxxInteroperability.h" Checksum="yes" />
449+
</Component>
450+
<Component Id="_SwiftStdlibCxxOverlay.h" Directory="_usr_lib_swift_swiftToCxx" Guid="05d867e2-da43-49b1-8cf5-3b4daa76773c">
451+
<File Id="_SwiftStdlibCxxOverlay.h" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\_SwiftStdlibCxxOverlay.h" Checksum="yes" />
452+
</Component>
453+
<Component Id="experimental_interoperability_version.json" Directory="_usr_lib_swift_swiftToCxx" Guid="e2bfde07-43b9-4fe6-9d4a-87d2412349b8">
454+
<File Id="experimental_interoperability_version.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\experimental-interoperability-version.json" Checksum="yes" />
455+
</Component>
456+
445457
<Component Id="ios4.json" Directory="_usr_lib_swift_migrator" Guid="86db2678-9f8b-446e-bfbc-eb45e725420e">
446458
<File Id="ios4.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\ios4.json" Checksum="yes" />
447459
</Component>

0 commit comments

Comments
 (0)