Skip to content

Commit 1f7e700

Browse files
compnerdcompnerd
committed
WiX: package Cxx and CxxShims in the SDK
Package up the SDK contents for the C++ support module. This is required to enable use of the C++ interop functionality.
1 parent af43ddb commit 1f7e700

File tree

3 files changed

+90
-0
lines changed

3 files changed

+90
-0
lines changed

‎platforms/Windows/sdk-amd64.wxs‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@
7474
</Directory>
7575
<Directory Id="CRT.swiftmodule" Name="CRT.swiftmodule">
7676
</Directory>
77+
<Directory Id="Cxx.swiftmodule" Name="Cxx.swiftmodule">
78+
</Directory>
7779
<Directory Id="Dispatch.swiftmodule" Name="Dispatch.swiftmodule">
7880
</Directory>
7981
<Directory Id="Foundation.swiftmodule" Name="Foundation.swiftmodule">
@@ -331,6 +333,22 @@
331333
</Component>
332334
</ComponentGroup>
333335

336+
<ComponentGroup Id="CXX">
337+
<Component Id="Cxx.swiftdoc" Directory="Cxx.swiftmodule" Guid="b170a09f-0483-486f-b7de-1e8f4e1644a4">
338+
<File Id="Cxx.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
339+
</Component>
340+
<Component Id="Cxx.swiftinterface" Directory="Cxx.swiftmodule" Guid="49971c71-8cb4-4eac-898d-71bb14d7280e">
341+
<File Id="Cxx.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
342+
</Component>
343+
<Component Id="Cxx.swiftmodule" Directory="Cxx.swiftmodule" Guid="911e165b-21e9-438e-b453-1d0aa1fdf4fe">
344+
<File Id="Cxx.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
345+
</Component>
346+
347+
<Component Id="swiftCxx.lib" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="a90ba944-b9f6-40a6-8184-f59ae23598fe">
348+
<File Id="swiftCxx.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\swiftCxx.lib" Checksum="yes" />
349+
</Component>
350+
</ComponentGroup>
351+
334352
<ComponentGroup Id="Foundation">
335353
<Component Id="Foundation.swiftdoc" Directory="Foundation.swiftmodule" Guid="d5ace934-794c-416f-886e-b9ae39eb8208">
336354
<File Id="Foundation.swiftdoc" Name="x86_64-unknown-windows-msvc.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\Foundation.swiftdoc" Checksum="yes" />
@@ -418,6 +436,16 @@
418436
</Component>
419437
</ComponentGroup>
420438

439+
<ComponentGroup Id="CXXShims">
440+
<Component Id="libcxxshim.h" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="77450677-ce9e-43f9-9db1-35231dcf563e">
441+
<File Id="libcxxshim.h" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\libcxxshim.h" Checksum="yes" />
442+
</Component>
443+
444+
<Component Id="libcxxshim.modulemap" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="e4fa6e5c-3dd5-49fd-9f27-a72d58c8d156">
445+
<File Id="libcxxshim.modulemap" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\libcxxshim.modulemap" Checksum="yes" />
446+
</Component>
447+
</ComponentGroup>
448+
421449
<ComponentGroup Id="Registrar" Directory="WindowsSDK_usr_lib_swift_windows_x86_64">
422450
<Component Id="swiftrt.obj" Guid="e546282a-79c8-4555-a45a-68a1447fa5d8">
423451
<File Id="swiftrt.obj" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\swiftrt.obj" Checksum="yes" />
@@ -472,6 +500,7 @@
472500
<ComponentGroupRef Id="_RegexParser" />
473501
<ComponentGroupRef Id="_StringProcessing" />
474502
<ComponentGroupRef Id="CRT" />
503+
<ComponentGroupRef Id="CXX" />
475504
<ComponentGroupRef Id="Foundation" />
476505
<ComponentGroupRef Id="FoundationNetworking" />
477506
<ComponentGroupRef Id="FoundationXML" />
@@ -480,6 +509,7 @@
480509
<ComponentGroupRef Id="WinSDK" />
481510

482511
<ComponentGroupRef Id="SwiftShims" />
512+
<ComponentGroupRef Id="CXXShims" />
483513

484514
<ComponentGroupRef Id="Registrar" />
485515
<ComponentGroupRef Id="SupportFiles" />

‎platforms/Windows/sdk-arm64.wxs‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@
7474
</Directory>
7575
<Directory Id="CRT.swiftmodule" Name="CRT.swiftmodule">
7676
</Directory>
77+
<Directory Id="Cxx.swiftmodule" Name="Cxx.swiftmodule">
78+
</Directory>
7779
<Directory Id="Dispatch.swiftmodule" Name="Dispatch.swiftmodule">
7880
</Directory>
7981
<Directory Id="Foundation.swiftmodule" Name="Foundation.swiftmodule">
@@ -331,6 +333,22 @@
331333
</Component>
332334
</ComponentGroup>
333335

336+
<ComponentGroup Id="CXX">
337+
<Component Id="Cxx.swiftdoc" Directory="Cxx.swiftmodule" Guid="2decbe47-1209-4abb-b94e-1bf6a83e2028">
338+
<File Id="Cxx.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
339+
</Component>
340+
<Component Id="Cxx.swiftinterface" Directory="Cxx.swiftmodule" Guid="3ad27fe2-031c-42de-a4ba-b2aa7bf79aa6">
341+
<File Id="Cxx.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
342+
</Component>
343+
<Component Id="Cxx.swiftmodule" Directory="Cxx.swiftmodule" Guid="e5bd9840-0430-46b8-b3c4-5ab389ac8c07">
344+
<File Id="Cxx.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
345+
</Component>
346+
347+
<Component Id="swiftCxx.lib" Directory="WindowsSDK_usr_lib_swift_windows_aarch64" Guid="f7bcc956-462e-43df-ae25-c5f4636b27d1">
348+
<File Id="swiftCxx.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\swiftCxx.lib" Checksum="yes" />
349+
</Component>
350+
</ComponentGroup>
351+
334352
<ComponentGroup Id="Foundation">
335353
<Component Id="Foundation.swiftdoc" Directory="Foundation.swiftmodule" Guid="b77de995-ebe7-409b-bfe6-2ae6c24e4d8d">
336354
<File Id="Foundation.swiftdoc" Name="aarch64-unknown-windows-msvc.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\Foundation.swiftdoc" Checksum="yes" />
@@ -418,6 +436,16 @@
418436
</Component>
419437
</ComponentGroup>
420438

439+
<ComponentGroup Id="CXXShims">
440+
<Component Id="libcxxshim.h" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="d579019d-d999-47f7-8b35-1d714874de80">
441+
<File Id="libcxxshim.h" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\libcxxshim.h" Checksum="yes" />
442+
</Component>
443+
444+
<Component Id="libcxxshim.modulemap" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="b5f65b19-cf8f-4862-b378-3e299887afa3">
445+
<File Id="libcxxshim.modulemap" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\libcxxshim.modulemap" Checksum="yes" />
446+
</Component>
447+
</ComponentGroup>
448+
421449
<ComponentGroup Id="Registrar" Directory="WindowsSDK_usr_lib_swift_windows_aarch64">
422450
<Component Id="swiftrt.obj" Guid="7daf0d39-db9e-4ee7-913b-7815b04f30ee">
423451
<File Id="swiftrt.obj" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\swiftrt.obj" Checksum="yes" />
@@ -472,6 +500,7 @@
472500
<ComponentGroupRef Id="_RegexParser" />
473501
<ComponentGroupRef Id="_StringProcessing" />
474502
<ComponentGroupRef Id="CRT" />
503+
<ComponentGroupRef Id="CXX" />
475504
<ComponentGroupRef Id="Foundation" />
476505
<ComponentGroupRef Id="FoundationNetworking" />
477506
<ComponentGroupRef Id="FoundationXML" />
@@ -480,6 +509,7 @@
480509
<ComponentGroupRef Id="WinSDK" />
481510

482511
<ComponentGroupRef Id="SwiftShims" />
512+
<ComponentGroupRef Id="CXXShims" />
483513

484514
<ComponentGroupRef Id="Registrar" />
485515
<ComponentGroupRef Id="SupportFiles" />

‎platforms/Windows/sdk-x86.wxs‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@
7474
</Directory>
7575
<Directory Id="CRT.swiftmodule" Name="CRT.swiftmodule">
7676
</Directory>
77+
<Directory Id="Cxx.swiftmdoule" Name="Cxx.swiftmdoule">
78+
</Directory>
7779
<Directory Id="Dispatch.swiftmodule" Name="Dispatch.swiftmodule">
7880
</Directory>
7981
<Directory Id="Foundation.swiftmodule" Name="Foundation.swiftmodule">
@@ -331,6 +333,22 @@
331333
</Component>
332334
</ComponentGroup>
333335

336+
<ComponentGroup Id="CXX">
337+
<Component Id="Cxx.swiftdoc" Directory="Cxx.swiftmodule" Guid="a7c78d68-abed-4065-ba82-08d4773bf4d8">
338+
<File Id="Cxx.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftdoc" Checksum="yes" />
339+
</Component>
340+
<Component Id="Cxx.swiftinterface" Directory="Cxx.swiftmodule" Guid="4f795ac4-f731-4115-984f-237f044540a0">
341+
<File Id="Cxx.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftinterface" Checksum="yes" />
342+
</Component>
343+
<Component Id="Cxx.swiftmodule" Directory="Cxx.swiftmodule" Guid="a9acf7c6-7ad7-4176-a280-ec0d534215b9">
344+
<File Id="Cxx.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftmodule" Checksum="yes" />
345+
</Component>
346+
347+
<Component Id="swiftCxx.lib" Directory="WindowsSDK_usr_lib_swift_windows_i686" Guid="b2897a7a-65c2-4f0f-b14c-6b466d2e3d34">
348+
<File Id="swiftCxx.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\swiftCxx.lib" Checksum="yes" />
349+
</Component>
350+
</ComponentGroup>
351+
334352
<ComponentGroup Id="Foundation">
335353
<Component Id="Foundation.swiftdoc" Directory="Foundation.swiftmodule" Guid="345d3a2b-7b55-4413-82b7-7e7b7ce17798">
336354
<File Id="Foundation.swiftdoc" Name="i686-unknown-windows-msvc.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\Foundation.swiftdoc" Checksum="yes" />
@@ -418,6 +436,16 @@
418436
</Component>
419437
</ComponentGroup>
420438

439+
<ComponentGroup Id="CXXShims">
440+
<Component Id="libcxxshim.h" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="d9653245-ca31-442a-b122-f5df3a3ad752">
441+
<File Id="libcxxshim.h" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\libcxxshim.h" Checksum="yes" />
442+
</Component>
443+
444+
<Component Id="libcxxshim.modulemap" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="52c178a4-f65b-46a4-9089-c686c755bf2e">
445+
<File Id="libcxxshim.modulemap" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\libcxxshim.modulemap" Checksum="yes" />
446+
</Component>
447+
</ComponentGroup>
448+
421449
<ComponentGroup Id="Registrar" Directory="WindowsSDK_usr_lib_swift_windows_i686">
422450
<Component Id="swiftrt.obj" Guid="a3da165c-3b42-4ad2-a412-a0bb4e31cba5">
423451
<File Id="swiftrt.obj" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\swiftrt.obj" Checksum="yes" />
@@ -466,6 +494,7 @@
466494
<ComponentGroupRef Id="_RegexParser" />
467495
<ComponentGroupRef Id="_StringProcessing" />
468496
<ComponentGroupRef Id="CRT" />
497+
<ComponentGroupRef Id="CXX" />
469498
<ComponentGroupRef Id="Foundation" />
470499
<ComponentGroupRef Id="FoundationNetworking" />
471500
<ComponentGroupRef Id="FoundationXML" />
@@ -474,6 +503,7 @@
474503
<ComponentGroupRef Id="WinSDK" />
475504

476505
<ComponentGroupRef Id="SwiftShims" />
506+
<ComponentGroupRef Id="CXXShims" />
477507

478508
<ComponentGroupRef Id="Registrar" />
479509
<ComponentGroupRef Id="SupportFiles" />

0 commit comments

Comments
 (0)