Skip to content

Commit 1ecde3e

Browse files
compnerdcompnerd
committed
WiX: remove _Runtime and Reflection packaging
This was removed on main, remove this here as well.
1 parent b182428 commit 1ecde3e

File tree

3 files changed

+0
-114
lines changed

3 files changed

+0
-114
lines changed

‎platforms/Windows/sdk-amd64.wxs

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@
6262
<Directory Id="WindowsSDK_usr_lib_swift_shims" Name="shims">
6363
</Directory>
6464
<Directory Id="WindowsSDK_usr_lib_swift_windows" Name="windows">
65-
<Directory Id="Reflection.swiftmodule" Name="Reflection.swiftmodule">
66-
</Directory>
67-
<Directory Id="_Runtime.swiftmodule" Name="_Runtime.swiftmodule">
68-
</Directory>
6965
<Directory Id="_Concurrency.swiftmodule" Name="_Concurrency.swiftmodule">
7066
</Directory>
7167
<Directory Id="_Differentiation.swiftmodule" Name="_Differentiation.swiftmodule">
@@ -244,38 +240,6 @@
244240
</Component>
245241
</ComponentGroup>
246242

247-
<ComponentGroup Id="Reflection">
248-
<Component Id="Reflection.swiftdoc" Directory="Reflection.swiftmodule" Guid="98d36176-7410-4a95-93d4-41360531e782">
249-
<File Id="Reflection.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Reflection.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
250-
</Component>
251-
<Component Id="Reflection.swiftinterface" Directory="Reflection.swiftmodule" Guid="8b01ffe8-4119-4ddf-9b45-9a66c33965d5">
252-
<File Id="Reflection.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Reflection.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
253-
</Component>
254-
<Component Id="Reflection.swiftmodule" Directory="Reflection.swiftmodule" Guid="c06e5076-aa5a-4eb4-8b01-de9b2d457b5f">
255-
<File Id="Reflection.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Reflection.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
256-
</Component>
257-
258-
<Component Id="swiftReflection.lib" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="a87d749e-f9ef-446f-b34a-25af295abebc">
259-
<File Id="swiftReflection.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\swiftReflection.lib" Checksum="yes" />
260-
</Component>
261-
</ComponentGroup>
262-
263-
<ComponentGroup Id="_Runtime">
264-
<Component Id="_Runtime.swiftdoc" Directory="_Runtime.swiftmodule" Guid="e66c5343-54b8-4be9-9fc2-26b5d634944f">
265-
<File Id="_Runtime.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Runtime.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
266-
</Component>
267-
<Component Id="_Runtime.swiftinterface" Directory="_Runtime.swiftmodule" Guid="2ca3764f-2c1e-4f0f-85a8-b8f14ed4db5f">
268-
<File Id="_Runtime.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Runtime.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
269-
</Component>
270-
<Component Id="_Runtime.swiftmodule" Directory="_Runtime.swiftmodule" Guid="5923b211-b0bf-4e0d-9d80-425c5b12383f">
271-
<File Id="_Runtime.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Runtime.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
272-
</Component>
273-
274-
<Component Id="swift_Runtime.lib" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="44c6e16b-46c0-4578-8fb4-ef26f0646168">
275-
<File Id="swift_Runtime.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\swift_Runtime.lib" Checksum="yes" />
276-
</Component>
277-
</ComponentGroup>
278-
279243
<ComponentGroup Id="_Concurrency">
280244
<Component Id="_Concurrency.swiftdoc" Directory="_Concurrency.swiftmodule" Guid="037314fe-f333-4ce4-b3bc-28947337032c">
281245
<File Id="_Concurrency.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Concurrency.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
@@ -536,7 +500,6 @@
536500
<ComponentGroupRef Id="Foundation" />
537501
<ComponentGroupRef Id="FoundationNetworking" />
538502
<ComponentGroupRef Id="FoundationXML" />
539-
<ComponentGroupRef Id="Reflection" />
540503
<ComponentGroupRef Id="Swift" />
541504
<ComponentGroupRef Id="SwiftOnoneSupport" />
542505
<ComponentGroupRef Id="SwiftRemoteMirror" />
@@ -545,7 +508,6 @@
545508
<ComponentGroupRef Id="_Concurrency" />
546509
<ComponentGroupRef Id="_Differentiation" />
547510
<ComponentGroupRef Id="_RegexParser" />
548-
<ComponentGroupRef Id="_Runtime" />
549511
<ComponentGroupRef Id="_StringProcessing" />
550512
<ComponentGroupRef Id="dispatch" />
551513

‎platforms/Windows/sdk-arm64.wxs

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@
6262
<Directory Id="WindowsSDK_usr_lib_swift_shims" Name="shims">
6363
</Directory>
6464
<Directory Id="WindowsSDK_usr_lib_swift_windows" Name="windows">
65-
<Directory Id="Reflection.swiftmodule" Name="Reflection.swiftmodule">
66-
</Directory>
67-
<Directory Id="_Runtime.swiftmodule" Name="_Runtime.swiftmodule">
68-
</Directory>
6965
<Directory Id="_Concurrency.swiftmodule" Name="_Concurrency.swiftmodule">
7066
</Directory>
7167
<Directory Id="_Differentiation.swiftmodule" Name="_Differentiation.swiftmodule">
@@ -244,38 +240,6 @@
244240
</Component>
245241
</ComponentGroup>
246242

247-
<ComponentGroup Id="Reflection">
248-
<Component Id="Reflection.swiftdoc" Directory="Reflection.swiftmodule" Guid="dbfe23ed-3137-42c3-805c-5395a96a3f27">
249-
<File Id="Reflection.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Reflection.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
250-
</Component>
251-
<Component Id="Reflection.swiftinterface" Directory="Reflection.swiftmodule" Guid="48e0bfb3-73e6-4f54-8cf7-13611f576f84">
252-
<File Id="Reflection.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Reflection.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
253-
</Component>
254-
<Component Id="Reflection.swiftmodule" Directory="Reflection.swiftmodule" Guid="a3d092dd-4d8f-4b85-b1e6-778099be6880">
255-
<File Id="Reflection.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Reflection.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
256-
</Component>
257-
258-
<Component Id="swiftReflection.lib" Directory="WindowsSDK_usr_lib_swift_windows_aarch64" Guid="0e494f73-0b59-4ddf-afe2-3084b6c8a1b7">
259-
<File Id="swiftReflection.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\swiftReflection.lib" Checksum="yes" />
260-
</Component>
261-
</ComponentGroup>
262-
263-
<ComponentGroup Id="_Runtime">
264-
<Component Id="_Runtime.swiftdoc" Directory="_Runtime.swiftmodule" Guid="395104b1-03c0-4a31-9d67-0fb4a2ebbd77">
265-
<File Id="_Runtime.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Runtime.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
266-
</Component>
267-
<Component Id="_Runtime.swiftinterface" Directory="_Runtime.swiftmodule" Guid="2125240d-1be9-46c3-b99a-c4e84f888b82">
268-
<File Id="_Runtime.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Runtime.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
269-
</Component>
270-
<Component Id="_Runtime.swiftmodule" Directory="_Runtime.swiftmodule" Guid="5e8a00f0-eb62-4473-b61c-82e8185140a3">
271-
<File Id="_Runtime.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Runtime.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
272-
</Component>
273-
274-
<Component Id="swift_Runtime.lib" Directory="WindowsSDK_usr_lib_swift_windows_aarch64" Guid="7be7efd9-0f81-4fe0-b765-b4e6c6c918dc">
275-
<File Id="swift_Runtime.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\swift_Runtime.lib" Checksum="yes" />
276-
</Component>
277-
</ComponentGroup>
278-
279243
<ComponentGroup Id="_Concurrency">
280244
<Component Id="_Concurrency.swiftdoc" Directory="_Concurrency.swiftmodule" Guid="35d5d47a-fc38-4c00-949f-8647dc58540f">
281245
<File Id="_Concurrency.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Concurrency.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
@@ -536,7 +500,6 @@
536500
<ComponentGroupRef Id="Foundation" />
537501
<ComponentGroupRef Id="FoundationNetworking" />
538502
<ComponentGroupRef Id="FoundationXML" />
539-
<ComponentGroupRef Id="Reflection" />
540503
<ComponentGroupRef Id="Swift" />
541504
<ComponentGroupRef Id="SwiftOnoneSupport" />
542505
<ComponentGroupRef Id="SwiftRemoteMirror" />
@@ -545,7 +508,6 @@
545508
<ComponentGroupRef Id="_Concurrency" />
546509
<ComponentGroupRef Id="_Differentiation" />
547510
<ComponentGroupRef Id="_RegexParser" />
548-
<ComponentGroupRef Id="_Runtime" />
549511
<ComponentGroupRef Id="_StringProcessing" />
550512
<ComponentGroupRef Id="dispatch" />
551513

‎platforms/Windows/sdk-x86.wxs

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@
6262
<Directory Id="WindowsSDK_usr_lib_swift_shims" Name="shims">
6363
</Directory>
6464
<Directory Id="WindowsSDK_usr_lib_swift_windows" Name="windows">
65-
<Directory Id="Reflection.swiftmodule" Name="Reflection.swiftmodule">
66-
</Directory>
67-
<Directory Id="_Runtime.swiftmodule" Name="_Runtime.swiftmodule">
68-
</Directory>
6965
<Directory Id="_Concurrency.swiftmodule" Name="_Concurrency.swiftmodule">
7066
</Directory>
7167
<Directory Id="_Differentiation.swiftmodule" Name="_Differentiation.swiftmodule">
@@ -244,38 +240,6 @@
244240
</Component>
245241
</ComponentGroup>
246242

247-
<ComponentGroup Id="Reflection">
248-
<Component Id="Reflection.swiftdoc" Directory="Reflection.swiftmodule" Guid="7d20d217-c642-44cd-8774-5d13d5d1d440">
249-
<File Id="Reflection.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Reflection.swiftmodule\i686-unknown-windows-msvc.swiftdoc" Checksum="yes" />
250-
</Component>
251-
<Component Id="Reflection.swiftinterface" Directory="Reflection.swiftmodule" Guid="2050a6e5-42fe-401d-bec9-cbb3dbf44e89">
252-
<File Id="Reflection.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Reflection.swiftmodule\i686-unknown-windows-msvc.swiftinterface" Checksum="yes" />
253-
</Component>
254-
<Component Id="Reflection.swiftmodule" Directory="Reflection.swiftmodule" Guid="0ca35b3e-1b9b-42b5-ba7a-59c95a92fa55">
255-
<File Id="Reflection.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Reflection.swiftmodule\i686-unknown-windows-msvc.swiftmodule" Checksum="yes" />
256-
</Component>
257-
258-
<Component Id="swiftReflection.lib" Directory="WindowsSDK_usr_lib_swift_windows_i686" Guid="304f413d-6640-4a06-aa64-8a9c33c7dd73">
259-
<File Id="swiftReflection.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\swiftReflection.lib" Checksum="yes" />
260-
</Component>
261-
</ComponentGroup>
262-
263-
<ComponentGroup Id="_Runtime">
264-
<Component Id="_Runtime.swiftdoc" Directory="_Runtime.swiftmodule" Guid="e4001f72-392e-4205-ba92-ed4b5a477cc1">
265-
<File Id="_Runtime.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Runtime.swiftmodule\i686-unknown-windows-msvc.swiftdoc" Checksum="yes" />
266-
</Component>
267-
<Component Id="_Runtime.swiftinterface" Directory="_Runtime.swiftmodule" Guid="6aa0d039-bf3e-4cc9-8364-4b8a2e88c84e">
268-
<File Id="_Runtime.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Runtime.swiftmodule\i686-unknown-windows-msvc.swiftinterface" Checksum="yes" />
269-
</Component>
270-
<Component Id="_Runtime.swiftmodule" Directory="_Runtime.swiftmodule" Guid="f9f10cf0-d59b-4f60-9efc-a17226f5f590">
271-
<File Id="_Runtime.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Runtime.swiftmodule\i686-unknown-windows-msvc.swiftmodule" Checksum="yes" />
272-
</Component>
273-
274-
<Component Id="swift_Runtime.lib" Directory="WindowsSDK_usr_lib_swift_windows_i686" Guid="f4462968-709d-44bc-8657-16e654946e3e">
275-
<File Id="swift_Runtime.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\swift_Runtime.lib" Checksum="yes" />
276-
</Component>
277-
</ComponentGroup>
278-
279243
<ComponentGroup Id="_Concurrency">
280244
<Component Id="_Concurrency.swiftdoc" Directory="_Concurrency.swiftmodule" Guid="6e17d82a-42d9-4894-8778-dcc8eca37a3b">
281245
<File Id="_Concurrency.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Concurrency.swiftmodule\i686-unknown-windows-msvc.swiftdoc" Checksum="yes" />
@@ -530,7 +494,6 @@
530494
<ComponentGroupRef Id="Foundation" />
531495
<ComponentGroupRef Id="FoundationNetworking" />
532496
<ComponentGroupRef Id="FoundationXML" />
533-
<ComponentGroupRef Id="Reflection" />
534497
<ComponentGroupRef Id="Swift" />
535498
<ComponentGroupRef Id="SwiftOnoneSupport" />
536499
<ComponentGroupRef Id="SwiftRemoteMirror" />
@@ -539,7 +502,6 @@
539502
<ComponentGroupRef Id="_Concurrency" />
540503
<ComponentGroupRef Id="_Differentiation" />
541504
<ComponentGroupRef Id="_RegexParser" />
542-
<ComponentGroupRef Id="_Runtime" />
543505
<ComponentGroupRef Id="_StringProcessing" />
544506
<ComponentGroupRef Id="dispatch" />
545507

0 commit comments

Comments
 (0)