Skip to content

Commit 1b35558

Browse files
compnerdcompnerd
authored
WiX: add CxxStdlib to the Windows packaging
This adds the final missing component of the C++ interop to the 5.9 release now that it is enabled in the build.
1 parent 9cb52fd commit 1b35558

File tree

3 files changed

+78
-12
lines changed

3 files changed

+78
-12
lines changed

‎platforms/Windows/sdk-amd64.wxs

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,11 @@
102102
</Directory>
103103
</Directory>
104104
</Directory>
105+
<Directory Id="WindowsSDK_usr_lib_swift_static" Name="swift_static">
106+
<Directory Id="WindowsSDK_usr_lib_swift_static_windows" Name="windows">
107+
<Directory Id="CxxStdlib.swiftmodule" Name="CxxStdlib.swiftmodule" />
108+
</Directory>
109+
</Directory>
105110
</Directory>
106111
<Directory Id="WindowsSDK_usr_share" Name="share">
107112
</Directory>
@@ -341,7 +346,7 @@
341346
</Component>
342347
</ComponentGroup>
343348

344-
<ComponentGroup Id="CXX">
349+
<ComponentGroup Id="Cxx">
345350
<Component Id="Cxx.swiftdoc" Directory="Cxx.swiftmodule" Guid="b170a09f-0483-486f-b7de-1e8f4e1644a4">
346351
<File Id="Cxx.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
347352
</Component>
@@ -357,6 +362,22 @@
357362
</Component>
358363
</ComponentGroup>
359364

365+
<ComponentGroup Id="CxxStdlib">
366+
<Component Id="CxxStdlib.swiftdoc" Directory="CxxStdlib.swiftmodule" Guid="a0156982-4705-4efb-8b2a-a4e5b0af7048">
367+
<File Id="CxxStdlib.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
368+
</Component>
369+
<Component Id="CxxStdlib.swiftinterface" Directory="CxxStdlib.swiftmodule" Guid="77d32d60-bc1b-4455-9257-9880b329170c">
370+
<File Id="CxxStdlib.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
371+
</Component>
372+
<Component Id="CxxStdlib.swiftmodule" Directory="CxxStdlib.swiftmodule" Guid="446847d4-09be-4377-9d25-b032d338678f">
373+
<File Id="CxxStdlib.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
374+
</Component>
375+
376+
<Component Id="libswiftCxxStdlib.lib" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="654eedf7-cb83-4589-9c89-d12e8e53b9fa">
377+
<File Id="libswiftCxxStdlib.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\libswiftCxxStdlib.lib" Checksum="yes" />
378+
</Component>
379+
</ComponentGroup>
380+
360381
<ComponentGroup Id="Foundation">
361382
<Component Id="Foundation.swiftdoc" Directory="Foundation.swiftmodule" Guid="d5ace934-794c-416f-886e-b9ae39eb8208">
362383
<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" />
@@ -444,7 +465,7 @@
444465
</Component>
445466
</ComponentGroup>
446467

447-
<ComponentGroup Id="CXXShims">
468+
<ComponentGroup Id="CxxShims">
448469
<Component Id="libcxxshim.h" Directory="WindowsSDK_usr_lib_swift_windows" Guid="77450677-ce9e-43f9-9db1-35231dcf563e">
449470
<File Id="libcxxshim.h" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\libcxxshim.h" Checksum="yes" />
450471
</Component>
@@ -502,7 +523,8 @@
502523
<Feature Id="WinX64SDK" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift SDK for Windows x86_64" Level="1" Title="Swift SDK for Windows x86_64" AllowAbsent="no">
503524
<ComponentGroupRef Id="BlocksRuntime" />
504525
<ComponentGroupRef Id="CRT" />
505-
<ComponentGroupRef Id="CXX" />
526+
<ComponentGroupRef Id="Cxx" />
527+
<ComponentGroupRef Id="CxxStdlib" />
506528
<ComponentGroupRef Id="Distributed" />
507529
<ComponentGroupRef Id="Foundation" />
508530
<ComponentGroupRef Id="FoundationNetworking" />
@@ -519,7 +541,7 @@
519541
<ComponentGroupRef Id="dispatch" />
520542

521543
<ComponentGroupRef Id="SwiftShims" />
522-
<ComponentGroupRef Id="CXXShims" />
544+
<ComponentGroupRef Id="CxxShims" />
523545

524546
<ComponentGroupRef Id="Registrar" />
525547
<ComponentGroupRef Id="AuxiliaryFiles" />

‎platforms/Windows/sdk-arm64.wxs

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,11 @@
102102
</Directory>
103103
</Directory>
104104
</Directory>
105+
<Directory Id="WindowsSDK_usr_lib_swift_static" Name="swift_static">
106+
<Directory Id="WindowsSDK_usr_lib_swift_static_windows" Name="windows">
107+
<Directory Id="CxxStdlib.swiftmodule" Name="CxxStdlib.swiftmodule" />
108+
</Directory>
109+
</Directory>
105110
</Directory>
106111
<Directory Id="WindowsSDK_usr_share" Name="share">
107112
</Directory>
@@ -341,7 +346,7 @@
341346
</Component>
342347
</ComponentGroup>
343348

344-
<ComponentGroup Id="CXX">
349+
<ComponentGroup Id="Cxx">
345350
<Component Id="Cxx.swiftdoc" Directory="Cxx.swiftmodule" Guid="2decbe47-1209-4abb-b94e-1bf6a83e2028">
346351
<File Id="Cxx.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
347352
</Component>
@@ -357,6 +362,22 @@
357362
</Component>
358363
</ComponentGroup>
359364

365+
<ComponentGroup Id="CxxStdlib">
366+
<Component Id="CxxStdlib.swiftdoc" Directory="CxxStdlib.swiftmodule" Guid="be4bf95b-6d55-4743-9872-f62621e903e1">
367+
<File Id="CxxStdlib.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
368+
</Component>
369+
<Component Id="CxxStdlib.swiftinterface" Directory="CxxStdlib.swiftmodule" Guid="0cd43438-de5e-4e32-832f-2505f1f37834">
370+
<File Id="CxxStdlib.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
371+
</Component>
372+
<Component Id="CxxStdlib.swiftmodule" Directory="CxxStdlib.swiftmodule" Guid="bd7ada20-67c4-4089-bd93-235586919d2e">
373+
<File Id="CxxStdlib.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
374+
</Component>
375+
376+
<Component Id="libswiftCxxStdlib.lib" Directory="WindowsSDK_usr_lib_swift_windows_aarch64" Guid="b30a1c97-b8af-4877-ace8-c0c9ad5e55c8">
377+
<File Id="libswiftCxxStdlib.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\libswiftCxxStdlib.lib" Checksum="yes" />
378+
</Component>
379+
</ComponentGroup>
380+
360381
<ComponentGroup Id="Foundation">
361382
<Component Id="Foundation.swiftdoc" Directory="Foundation.swiftmodule" Guid="b77de995-ebe7-409b-bfe6-2ae6c24e4d8d">
362383
<File Id="Foundation.swiftdoc" Name="aarch64-unknown-windows-msvc.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\Foundation.swiftdoc" Checksum="yes" />
@@ -444,7 +465,7 @@
444465
</Component>
445466
</ComponentGroup>
446467

447-
<ComponentGroup Id="CXXShims">
468+
<ComponentGroup Id="CxxShims">
448469
<Component Id="libcxxshim.h" Directory="WindowsSDK_usr_lib_swift_windows" Guid="d579019d-d999-47f7-8b35-1d714874de80">
449470
<File Id="libcxxshim.h" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\libcxxshim.h" Checksum="yes" />
450471
</Component>
@@ -502,7 +523,8 @@
502523
<Feature Id="WinARM64SDK" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift SDK for Windows aarch64" Level="1" Title="Swift SDK for Windows aarch64">
503524
<ComponentGroupRef Id="BlocksRuntime" />
504525
<ComponentGroupRef Id="CRT" />
505-
<ComponentGroupRef Id="CXX" />
526+
<ComponentGroupRef Id="Cxx" />
527+
<ComponentGroupRef Id="CxxStdlib" />
506528
<ComponentGroupRef Id="Distributed" />
507529
<ComponentGroupRef Id="Foundation" />
508530
<ComponentGroupRef Id="FoundationNetworking" />
@@ -519,7 +541,7 @@
519541
<ComponentGroupRef Id="dispatch" />
520542

521543
<ComponentGroupRef Id="SwiftShims" />
522-
<ComponentGroupRef Id="CXXShims" />
544+
<ComponentGroupRef Id="CxxShims" />
523545

524546
<ComponentGroupRef Id="Registrar" />
525547
<ComponentGroupRef Id="AuxiliaryFiles" />

‎platforms/Windows/sdk-x86.wxs

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,11 @@
101101
</Directory>
102102
</Directory>
103103
</Directory>
104+
<Directory Id="WindowsSDK_usr_lib_swift_static" Name="swift_static">
105+
<Directory Id="WindowsSDK_usr_lib_swift_static_windows" Name="windows">
106+
<Directory Id="CxxStdlib.swiftmodule" Name="CxxStdlib.swiftmodule" />
107+
</Directory>
108+
</Directory>
104109
</Directory>
105110
<Directory Id="WindowsSDK_usr_share" Name="share">
106111
</Directory>
@@ -339,7 +344,7 @@
339344
</Component>
340345
</ComponentGroup>
341346

342-
<ComponentGroup Id="CXX">
347+
<ComponentGroup Id="Cxx">
343348
<Component Id="Cxx.swiftdoc" Directory="Cxx.swiftmodule" Guid="a7c78d68-abed-4065-ba82-08d4773bf4d8">
344349
<File Id="Cxx.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftdoc" Checksum="yes" />
345350
</Component>
@@ -355,6 +360,22 @@
355360
</Component>
356361
</ComponentGroup>
357362

363+
<ComponentGroup Id="CxxStdlib">
364+
<Component Id="CxxStdlib.swiftdoc" Directory="CxxStdlib.swiftmodule" Guid="6edc85d1-5db5-411b-9a15-d0ade693989a">
365+
<File Id="CxxStdlib.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\i686-unknown-windows-msvc.swiftdoc" Checksum="yes" />
366+
</Component>
367+
<Component Id="CxxStdlib.swiftinterface" Directory="CxxStdlib.swiftmodule" Guid="9e078f6f-1c64-4af2-8ca5-7dd231c4e545">
368+
<File Id="CxxStdlib.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\i686-unknown-windows-msvc.swiftinterface" Checksum="yes" />
369+
</Component>
370+
<Component Id="CxxStdlib.swiftmodule" Directory="CxxStdlib.swiftmodule" Guid="e49baae6-a192-4b91-af90-be5bb51d803c">
371+
<File Id="CxxStdlib.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\i686-unknown-windows-msvc.swiftmodule" Checksum="yes" />
372+
</Component>
373+
374+
<Component Id="libswiftCxxStdlib.lib" Directory="WindowsSDK_usr_lib_swift_windows_i686" Guid="f4342fea-b975-4e24-9881-8927d6ebb0fe">
375+
<File Id="libswiftCxxStdlib.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\libswiftCxxStdlib.lib" Checksum="yes" />
376+
</Component>
377+
</ComponentGroup>
378+
358379
<ComponentGroup Id="Foundation">
359380
<Component Id="Foundation.swiftdoc" Directory="Foundation.swiftmodule" Guid="345d3a2b-7b55-4413-82b7-7e7b7ce17798">
360381
<File Id="Foundation.swiftdoc" Name="i686-unknown-windows-msvc.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\Foundation.swiftdoc" Checksum="yes" />
@@ -442,7 +463,7 @@
442463
</Component>
443464
</ComponentGroup>
444465

445-
<ComponentGroup Id="CXXShims">
466+
<ComponentGroup Id="CxxShims">
446467
<Component Id="libcxxshim.h" Directory="WindowsSDK_usr_lib_swift_windows" Guid="d9653245-ca31-442a-b122-f5df3a3ad752">
447468
<File Id="libcxxshim.h" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\libcxxshim.h" Checksum="yes" />
448469
</Component>
@@ -496,7 +517,8 @@
496517
<Feature Id="Win32SDK" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift SDK for Windows i686" Level="1" Title="Swift SDK for Windows i686">
497518
<ComponentGroupRef Id="BlocksRuntime" />
498519
<ComponentGroupRef Id="CRT" />
499-
<ComponentGroupRef Id="CXX" />
520+
<ComponentGroupRef Id="Cxx" />
521+
<ComponentGroupRef Id="CxxStdlib" />
500522
<ComponentGroupRef Id="Distributed" />
501523
<ComponentGroupRef Id="Foundation" />
502524
<ComponentGroupRef Id="FoundationNetworking" />
@@ -513,7 +535,7 @@
513535
<ComponentGroupRef Id="dispatch" />
514536

515537
<ComponentGroupRef Id="SwiftShims" />
516-
<ComponentGroupRef Id="CXXShims" />
538+
<ComponentGroupRef Id="CxxShims" />
517539

518540
<ComponentGroupRef Id="Registrar" />
519541
<ComponentGroupRef Id="AuxiliaryFiles" />

0 commit comments

Comments
 (0)