Skip to content

Commit 796169c

Browse files
compnerdcompnerd
committed
WiX: package up C++ Interop libraries
This adds the C++ Interop libraries to the experimental SDK.
1 parent bd9e9e9 commit 796169c

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?>
@@ -206,6 +207,8 @@
206207
<Directory Id="lib_RegexParser.swiftmodule" Name="_RegexParser.swiftmodule" />
207208
<Directory Id="lib_StringProcessing.swiftmodule" Name="_StringProcessing.swiftmodule" />
208209
<Directory Id="libCRT.swiftmodule" Name="CRT.swiftmodule" />
210+
<Directory Id="libCxx.swiftmodule" Name="Cxx.swiftmodule" />
211+
<Directory Id="libCxxStdlib.swiftmodule" Name="CxxStdlib.swiftmodule" />
209212
<Directory Id="libDispatch.swiftmodule" Name="Dispatch.swiftmodule" />
210213
<Directory Id="libDistributed.swiftmodule" Name="Distributed.swiftmodule" />
211214
<Directory Id="libFoundation.swiftmodule" Name="Foundation.swiftmodule" />
@@ -1411,6 +1414,49 @@
14111414
</ComponentGroup>
14121415
<?endif?>
14131416

1417+
<?if $(IncludeARM64) = True?>
1418+
<ComponentGroup Id="libCxx.arm64" Directory="libCxx.swiftmodule">
1419+
<Component DiskId="6">
1420+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
1421+
</Component>
1422+
<Component DiskId="6">
1423+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
1424+
</Component>
1425+
1426+
<Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
1427+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftCxx.lib" />
1428+
</Component>
1429+
</ComponentGroup>
1430+
<?endif?>
1431+
<?if $(IncludeX64) = True?>
1432+
<ComponentGroup Id="libCxx.x64" Directory="libCxx.swiftmodule">
1433+
<Component DiskId="7">
1434+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
1435+
</Component>
1436+
<Component DiskId="7">
1437+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
1438+
</Component>
1439+
1440+
<Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64" DiskId="7">
1441+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftCxx.lib" />
1442+
</Component>
1443+
</ComponentGroup>
1444+
<?endif?>
1445+
<?if $(IncludeX86) = True?>
1446+
<ComponentGroup Id="libCxx.x86" Directory="libCxx.swiftmodule">
1447+
<Component DiskId="8">
1448+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
1449+
</Component>
1450+
<Component DiskId="8">
1451+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
1452+
</Component>
1453+
1454+
<Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86" DiskId="8">
1455+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libswiftCxx.lib" />
1456+
</Component>
1457+
</ComponentGroup>
1458+
<?endif?>
1459+
14141460
<!-- CxxStdlib -->
14151461
<?if $(IncludeARM64) = True?>
14161462
<ComponentGroup Id="LegacyCxxStdlib.arm64" Directory="LegacyCxxStdlib.swiftmodule">
@@ -1464,6 +1510,49 @@
14641510
</ComponentGroup>
14651511
<?endif?>
14661512

1513+
<?if $(IncludeARM64) = True?>
1514+
<ComponentGroup Id="libCxxStdlib.arm64" Directory="libCxxStdlib.swiftmodule">
1515+
<Component DiskId="6">
1516+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
1517+
</Component>
1518+
<Component DiskId="6">
1519+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
1520+
</Component>
1521+
1522+
<Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
1523+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftCxxStdlib.lib" />
1524+
</Component>
1525+
</ComponentGroup>
1526+
<?endif?>
1527+
<?if $(IncludeX64) = True?>
1528+
<ComponentGroup Id="libCxxStdlib.x64" Directory="libCxxStdlib.swiftmodule">
1529+
<Component DiskId="7">
1530+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
1531+
</Component>
1532+
<Component DiskId="7">
1533+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
1534+
</Component>
1535+
1536+
<Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64" DiskId="7">
1537+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftCxxStdlib.lib" />
1538+
</Component>
1539+
</ComponentGroup>
1540+
<?endif?>
1541+
<?if $(IncludeX86) = True?>
1542+
<ComponentGroup Id="libCxxStdlib.x86" Directory="libCxxStdlib.swiftmodule">
1543+
<Component DiskId="8">
1544+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
1545+
</Component>
1546+
<Component DiskId="8">
1547+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
1548+
</Component>
1549+
1550+
<Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86" DiskId="8">
1551+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libswiftCxxStdlib.lib" />
1552+
</Component>
1553+
</ComponentGroup>
1554+
<?endif?>
1555+
14671556
<!-- Distributed -->
14681557
<?if $(IncludeARM64) = True?>
14691558
<ComponentGroup Id="LegacyDistributed.arm64" Directory="LegacyDistributed.swiftmodule">
@@ -2648,6 +2737,12 @@
26482737
</Component>
26492738
</ComponentGroup>
26502739

2740+
<ComponentGroup Id="ExperimentalAPINotes" Directory="WindowsExperimentalSDK_usr_lib_swift_apinotes">
2741+
<Component DiskId="5">
2742+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift\apinotes\std.apinotes" />
2743+
</Component>
2744+
</ComponentGroup>
2745+
26512746
<!-- libcxxshim -->
26522747
<ComponentGroup Id="libcxxshim" Directory="WindowsSDK_usr_lib_swift_windows">
26532748
<Component DiskId="1">
@@ -2661,6 +2756,18 @@
26612756
</Component>
26622757
</ComponentGroup>
26632758

2759+
<ComponentGroup Id="ExperimentalCXXShim" Directory="WindowsExperimentalSDK_usr_lib_swift_windows">
2760+
<Component DiskId="5">
2761+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\libcxxshim.h" />
2762+
</Component>
2763+
<Component DiskId="5">
2764+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\libcxxshim.modulemap" />
2765+
</Component>
2766+
<Component DiskId="5">
2767+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\libcxxstdlibshim.h" />
2768+
</Component>
2769+
</ComponentGroup>
2770+
26642771
<!-- Registrar -->
26652772
<?if $(IncludeARM64) = True?>
26662773
<ComponentGroup Id="Registrar.arm64" Directory="WindowsSDK_usr_lib_swift_windows_arm64">
@@ -3015,7 +3122,9 @@
30153122
<ComponentGroupRef Id="libBlocksRuntime" />
30163123
<ComponentGroupRef Id="libdispatch" />
30173124

3125+
<ComponentGroupRef Id="ExperimentalAPINotes" />
30183126
<ComponentGroupRef Id="ExperimentalAuxiliaryFiles" />
3127+
<ComponentGroupRef Id="ExperimentalCXXShim" />
30193128
<ComponentGroupRef Id="ExperimentalConfiguration" />
30203129
<ComponentGroupRef Id="ExperimentalSwiftShims" />
30213130

@@ -3036,6 +3145,8 @@
30363145
<ComponentGroupRef Id="lib_StringProcessing.arm64" />
30373146
<ComponentGroupRef Id="libBlocksRuntime.arm64" />
30383147
<ComponentGroupRef Id="libCRT.arm64" />
3148+
<ComponentGroupRef Id="libCxx.arm64" />
3149+
<ComponentGroupRef Id="libCxxStdlib.arm64" />
30393150
<ComponentGroupRef Id="libDistributed.arm64" />
30403151
<ComponentGroupRef Id="libdispatch.arm64" />
30413152
<ComponentGroupRef Id="libFoundation.arm64" />
@@ -3070,6 +3181,8 @@
30703181
<ComponentGroupRef Id="lib_StringProcessing.x64" />
30713182
<ComponentGroupRef Id="libBlocksRuntime.x64" />
30723183
<ComponentGroupRef Id="libCRT.x64" />
3184+
<ComponentGroupRef Id="libCxx.x64" />
3185+
<ComponentGroupRef Id="libCxxStdlib.x64" />
30733186
<ComponentGroupRef Id="libDistributed.x64" />
30743187
<ComponentGroupRef Id="libdispatch.x64" />
30753188
<ComponentGroupRef Id="libFoundation.x64" />
@@ -3104,6 +3217,8 @@
31043217
<ComponentGroupRef Id="lib_StringProcessing.x86" />
31053218
<ComponentGroupRef Id="libBlocksRuntime.x86" />
31063219
<ComponentGroupRef Id="libCRT.x86" />
3220+
<ComponentGroupRef Id="libCxx.x86" />
3221+
<ComponentGroupRef Id="libCxxStdlib.x86" />
31073222
<ComponentGroupRef Id="libDistributed.x86" />
31083223
<ComponentGroupRef Id="libdispatch.x86" />
31093224
<ComponentGroupRef Id="libFoundation.x86" />

0 commit comments

Comments
 (0)