Skip to content

Commit c6bb90b

Browse files
compnerdcompnerd
committed
WiX: package up C++ Interop libraries
This adds the C++ Interop libraries to the experimental SDK.
1 parent 8b122e0 commit c6bb90b

File tree

1 file changed

+116
-1
lines changed

1 file changed

+116
-1
lines changed

‎platforms/Windows/platforms/windows/windows.wxs‎

Lines changed: 116 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,9 @@
184184
</Directory>
185185
<Directory Name="lib">
186186
<Directory Name="swift">
187+
<Directory Id="WindowsExperimentalSDK_usr_lib_swift_apinotes" Name="apinotes" />
187188
<Directory Id="WindowsExperimentalSDK_usr_lib_swift_shims" Name="shims" />
188-
<Directory Name="windows">
189+
<Directory Id="WindowsExperimentalSDK_usr_lib_swift_windows" Name="windows">
189190
<?if $(IncludeARM64) = True?>
190191
<Directory Id="WindowsExperimentalSDK_usr_lib_swift_windows_arm64" Name="aarch64" DiskId="6" />
191192
<?endif?>
@@ -207,6 +208,8 @@
207208
<Directory Id="lib_StringProcessing.swiftmodule" Name="_StringProcessing.swiftmodule" />
208209
<Directory Id="lib_Volatile.swiftmodule" Name="_Volatile.swiftmodule" />
209210
<Directory Id="libCRT.swiftmodule" Name="CRT.swiftmodule" />
211+
<Directory Id="libCxx.swiftmodule" Name="Cxx.swiftmodule" />
212+
<Directory Id="libCxxStdlib.swiftmodule" Name="CxxStdlib.swiftmodule" />
210213
<Directory Id="libDispatch.swiftmodule" Name="Dispatch.swiftmodule" />
211214
<Directory Id="libDistributed.swiftmodule" Name="Distributed.swiftmodule" />
212215
<Directory Id="libFoundation.swiftmodule" Name="Foundation.swiftmodule" />
@@ -1455,6 +1458,49 @@
14551458
</ComponentGroup>
14561459
<?endif?>
14571460

1461+
<?if $(IncludeARM64) = True?>
1462+
<ComponentGroup Id="libCxx.arm64" Directory="libCxx.swiftmodule">
1463+
<Component DiskId="6">
1464+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
1465+
</Component>
1466+
<Component DiskId="6">
1467+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
1468+
</Component>
1469+
1470+
<Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
1471+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftCxx.lib" />
1472+
</Component>
1473+
</ComponentGroup>
1474+
<?endif?>
1475+
<?if $(IncludeX64) = True?>
1476+
<ComponentGroup Id="libCxx.x64" Directory="libCxx.swiftmodule">
1477+
<Component DiskId="7">
1478+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
1479+
</Component>
1480+
<Component DiskId="7">
1481+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
1482+
</Component>
1483+
1484+
<Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64" DiskId="7">
1485+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftCxx.lib" />
1486+
</Component>
1487+
</ComponentGroup>
1488+
<?endif?>
1489+
<?if $(IncludeX86) = True?>
1490+
<ComponentGroup Id="libCxx.x86" Directory="libCxx.swiftmodule">
1491+
<Component DiskId="8">
1492+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
1493+
</Component>
1494+
<Component DiskId="8">
1495+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
1496+
</Component>
1497+
1498+
<Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86" DiskId="8">
1499+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libswiftCxx.lib" />
1500+
</Component>
1501+
</ComponentGroup>
1502+
<?endif?>
1503+
14581504
<!-- CxxStdlib -->
14591505
<?if $(IncludeARM64) = True?>
14601506
<ComponentGroup Id="LegacyCxxStdlib.arm64" Directory="LegacyCxxStdlib.swiftmodule">
@@ -1508,6 +1554,49 @@
15081554
</ComponentGroup>
15091555
<?endif?>
15101556

1557+
<?if $(IncludeARM64) = True?>
1558+
<ComponentGroup Id="libCxxStdlib.arm64" Directory="libCxxStdlib.swiftmodule">
1559+
<Component DiskId="6">
1560+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
1561+
</Component>
1562+
<Component DiskId="6">
1563+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
1564+
</Component>
1565+
1566+
<Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
1567+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftCxxStdlib.lib" />
1568+
</Component>
1569+
</ComponentGroup>
1570+
<?endif?>
1571+
<?if $(IncludeX64) = True?>
1572+
<ComponentGroup Id="libCxxStdlib.x64" Directory="libCxxStdlib.swiftmodule">
1573+
<Component DiskId="7">
1574+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
1575+
</Component>
1576+
<Component DiskId="7">
1577+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
1578+
</Component>
1579+
1580+
<Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64" DiskId="7">
1581+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftCxxStdlib.lib" />
1582+
</Component>
1583+
</ComponentGroup>
1584+
<?endif?>
1585+
<?if $(IncludeX86) = True?>
1586+
<ComponentGroup Id="libCxxStdlib.x86" Directory="libCxxStdlib.swiftmodule">
1587+
<Component DiskId="8">
1588+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
1589+
</Component>
1590+
<Component DiskId="8">
1591+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
1592+
</Component>
1593+
1594+
<Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86" DiskId="8">
1595+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libswiftCxxStdlib.lib" />
1596+
</Component>
1597+
</ComponentGroup>
1598+
<?endif?>
1599+
15111600
<!-- Distributed -->
15121601
<?if $(IncludeARM64) = True?>
15131602
<ComponentGroup Id="LegacyDistributed.arm64" Directory="LegacyDistributed.swiftmodule">
@@ -2692,6 +2781,12 @@
26922781
</Component>
26932782
</ComponentGroup>
26942783

2784+
<ComponentGroup Id="ExperimentalAPINotes" Directory="WindowsExperimentalSDK_usr_lib_swift_apinotes">
2785+
<Component DiskId="5">
2786+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift\apinotes\std.apinotes" />
2787+
</Component>
2788+
</ComponentGroup>
2789+
26952790
<!-- libcxxshim -->
26962791
<ComponentGroup Id="libcxxshim" Directory="WindowsSDK_usr_lib_swift_windows">
26972792
<Component DiskId="1">
@@ -2705,6 +2800,18 @@
27052800
</Component>
27062801
</ComponentGroup>
27072802

2803+
<ComponentGroup Id="ExperimentalCXXShim" Directory="WindowsExperimentalSDK_usr_lib_swift_windows">
2804+
<Component DiskId="5">
2805+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\libcxxshim.h" />
2806+
</Component>
2807+
<Component DiskId="5">
2808+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\libcxxshim.modulemap" />
2809+
</Component>
2810+
<Component DiskId="5">
2811+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\libcxxstdlibshim.h" />
2812+
</Component>
2813+
</ComponentGroup>
2814+
27082815
<!-- Registrar -->
27092816
<?if $(IncludeARM64) = True?>
27102817
<ComponentGroup Id="Registrar.arm64" Directory="WindowsSDK_usr_lib_swift_windows_arm64">
@@ -3059,7 +3166,9 @@
30593166
<ComponentGroupRef Id="libBlocksRuntime" />
30603167
<ComponentGroupRef Id="libdispatch" />
30613168

3169+
<ComponentGroupRef Id="ExperimentalAPINotes" />
30623170
<ComponentGroupRef Id="ExperimentalAuxiliaryFiles" />
3171+
<ComponentGroupRef Id="ExperimentalCXXShim" />
30633172
<ComponentGroupRef Id="ExperimentalConfiguration" />
30643173
<ComponentGroupRef Id="ExperimentalSwiftShims" />
30653174

@@ -3083,6 +3192,8 @@
30833192
<ComponentGroupRef Id="lib_Volatile.arm64" />
30843193
<ComponentGroupRef Id="libBlocksRuntime.arm64" />
30853194
<ComponentGroupRef Id="libCRT.arm64" />
3195+
<ComponentGroupRef Id="libCxx.arm64" />
3196+
<ComponentGroupRef Id="libCxxStdlib.arm64" />
30863197
<ComponentGroupRef Id="libDistributed.arm64" />
30873198
<ComponentGroupRef Id="libdispatch.arm64" />
30883199
<ComponentGroupRef Id="libFoundation.arm64" />
@@ -3118,6 +3229,8 @@
31183229
<ComponentGroupRef Id="lib_Volatile.x64" />
31193230
<ComponentGroupRef Id="libBlocksRuntime.x64" />
31203231
<ComponentGroupRef Id="libCRT.x64" />
3232+
<ComponentGroupRef Id="libCxx.x64" />
3233+
<ComponentGroupRef Id="libCxxStdlib.x64" />
31213234
<ComponentGroupRef Id="libDistributed.x64" />
31223235
<ComponentGroupRef Id="libdispatch.x64" />
31233236
<ComponentGroupRef Id="libFoundation.x64" />
@@ -3153,6 +3266,8 @@
31533266
<ComponentGroupRef Id="lib_Volatile.x86" />
31543267
<ComponentGroupRef Id="libBlocksRuntime.x86" />
31553268
<ComponentGroupRef Id="libCRT.x86" />
3269+
<ComponentGroupRef Id="libCxx.x86" />
3270+
<ComponentGroupRef Id="libCxxStdlib.x86" />
31563271
<ComponentGroupRef Id="libDistributed.x86" />
31573272
<ComponentGroupRef Id="libdispatch.x86" />
31583273
<ComponentGroupRef Id="libFoundation.x86" />

0 commit comments

Comments
 (0)