Skip to content

Commit ddd5c14

Browse files
committed
WiX: package up _Volatile in the experimental SDK
Include the new build of _Volatile into the static experimental SDK.
1 parent f159aa2 commit ddd5c14

File tree

1 file changed

+47
-0
lines changed

1 file changed

+47
-0
lines changed

platforms/Windows/platforms/windows/windows.wxs

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@
205205
<Directory Id="lib_FoundationCollections.swiftmodule" Name="_FoundationCollections.swiftmodule" />
206206
<Directory Id="lib_RegexParser.swiftmodule" Name="_RegexParser.swiftmodule" />
207207
<Directory Id="lib_StringProcessing.swiftmodule" Name="_StringProcessing.swiftmodule" />
208+
<Directory Id="lib_Volatile.swiftmodule" Name="_Volatile.swiftmodule" />
208209
<Directory Id="libCRT.swiftmodule" Name="CRT.swiftmodule" />
209210
<Directory Id="libDispatch.swiftmodule" Name="Dispatch.swiftmodule" />
210211
<Directory Id="libDistributed.swiftmodule" Name="Distributed.swiftmodule" />
@@ -1262,6 +1263,49 @@
12621263
</ComponentGroup>
12631264
<?endif?>
12641265

1266+
<?if $(IncludeARM64) = True?>
1267+
<ComponentGroup Id="lib_Volatile.arm64" Directory="lib_Volatile.swiftmodule">
1268+
<Component DiskId="6">
1269+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Volatile.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
1270+
</Component>
1271+
<Component DiskId="6">
1272+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Volatile.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
1273+
</Component>
1274+
1275+
<Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
1276+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libswift_Volatile.lib" />
1277+
</Component>
1278+
</ComponentGroup>
1279+
<?endif?>
1280+
<?if $(IncludeX64) = True?>
1281+
<ComponentGroup Id="lib_Volatile.x64" Directory="lib_Volatile.swiftmodule">
1282+
<Component DiskId="7">
1283+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Volatile.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
1284+
</Component>
1285+
<Component DiskId="7">
1286+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Volatile.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
1287+
</Component>
1288+
1289+
<Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
1290+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libswift_Volatile.lib" />
1291+
</Component>
1292+
</ComponentGroup>
1293+
<?endif?>
1294+
<?if $(IncludeX86) = True?>
1295+
<ComponentGroup Id="lib_Volatile.x86" Directory="lib_Volatile.swiftmodule">
1296+
<Component DiskId="8">
1297+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Volatile.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
1298+
</Component>
1299+
<Component DiskId="8">
1300+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Volatile.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
1301+
</Component>
1302+
1303+
<Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
1304+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libswift_Volatile.lib" />
1305+
</Component>
1306+
</ComponentGroup>
1307+
<?endif?>
1308+
12651309
<!-- CRT -->
12661310
<?if $(IncludeARM64) = True?>
12671311
<ComponentGroup Id="LegacyCRT.arm64" Directory="LegacyCRT.swiftmodule">
@@ -3034,6 +3078,7 @@
30343078
<ComponentGroupRef Id="lib_FoundationUnicode.arm64" />
30353079
<ComponentGroupRef Id="lib_RegexParser.arm64" />
30363080
<ComponentGroupRef Id="lib_StringProcessing.arm64" />
3081+
<ComponentGroupRef Id="lib_Volatile.arm64" />
30373082
<ComponentGroupRef Id="libBlocksRuntime.arm64" />
30383083
<ComponentGroupRef Id="libCRT.arm64" />
30393084
<ComponentGroupRef Id="libDistributed.arm64" />
@@ -3068,6 +3113,7 @@
30683113
<ComponentGroupRef Id="lib_FoundationUnicode.x64" />
30693114
<ComponentGroupRef Id="lib_RegexParser.x64" />
30703115
<ComponentGroupRef Id="lib_StringProcessing.x64" />
3116+
<ComponentGroupRef Id="lib_Volatile.x64" />
30713117
<ComponentGroupRef Id="libBlocksRuntime.x64" />
30723118
<ComponentGroupRef Id="libCRT.x64" />
30733119
<ComponentGroupRef Id="libDistributed.x64" />
@@ -3102,6 +3148,7 @@
31023148
<ComponentGroupRef Id="lib_FoundationUnicode.x86" />
31033149
<ComponentGroupRef Id="lib_RegexParser.x86" />
31043150
<ComponentGroupRef Id="lib_StringProcessing.x86" />
3151+
<ComponentGroupRef Id="lib_Volatile.x86" />
31053152
<ComponentGroupRef Id="libBlocksRuntime.x86" />
31063153
<ComponentGroupRef Id="libCRT.x86" />
31073154
<ComponentGroupRef Id="libDistributed.x86" />

0 commit comments

Comments
 (0)