Skip to content

Commit 339eee7

Browse files
compnerdcompnerd
committed
WiX: adjust the packaging for Cxx, CxxStdlib
These are now built statically for the dynamic standard library and should be packaged as such.
1 parent 1b35558 commit 339eee7

File tree

6 files changed

+21
-35
lines changed

6 files changed

+21
-35
lines changed

‎platforms/Windows/runtime-amd64.wxs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@
6161
<Component Id="swiftCore.dll" Guid="4098dff8-8b8d-48ee-a234-d29104d4c809">
6262
<File Id="swiftCore.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftCore.dll" Checksum="yes" />
6363
</Component>
64-
<Component Id="swiftCxx.dll" Guid="45eb46fc-a006-4fe9-abf0-42e26e3d3c87">
65-
<File Id="swiftCxx.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftCxx.dll" Checksum="yes" />
66-
</Component>
6764
<Component Id="swiftDispatch.dll" Guid="312ffb9e-7ecf-423f-8f59-3041d2776e4a">
6865
<File Id="swiftDispatch.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftDispatch.dll" Checksum="yes" />
6966
</Component>

‎platforms/Windows/runtime-arm64.wxs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@
6161
<Component Id="swiftCore.dll" Guid="b11c37b0-b6ad-4e55-b4e7-0517ff7a161f">
6262
<File Id="swiftCore.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftCore.dll" Checksum="yes" />
6363
</Component>
64-
<Component Id="swiftCxx.dll" Guid="7bbf8fd4-769d-4e4f-8d62-f1d07d568ccf">
65-
<File Id="swiftCxx.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftCxx.dll" Checksum="yes" />
66-
</Component>
6764
<Component Id="swiftDispatch.dll" Guid="ce50982a-4bb3-43fc-a5ce-9fc709143b47">
6865
<File Id="swiftDispatch.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftDispatch.dll" Checksum="yes" />
6966
</Component>

‎platforms/Windows/runtime-x86.wxs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@
6161
<Component Id="swiftCore.dll" Guid="d816134d-2de1-4e50-90dd-a36675c09c3e">
6262
<File Id="swiftCore.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftCore.dll" Checksum="yes" />
6363
</Component>
64-
<Component Id="swiftCxx.dll" Guid="9752dfcf-b9fd-457d-b983-e2f346f97c3d">
65-
<File Id="swiftCxx.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftCxx.dll" Checksum="yes" />
66-
</Component>
6764
<Component Id="swiftDispatch.dll" Guid="fd38df32-2bcd-4da4-98b3-f26abd1ac6de">
6865
<File Id="swiftDispatch.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftDispatch.dll" Checksum="yes" />
6966
</Component>

‎platforms/Windows/sdk-amd64.wxs

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@
8484
</Directory>
8585
<Directory Id="Cxx.swiftmodule" Name="Cxx.swiftmodule">
8686
</Directory>
87+
<Directory Id="CxxStdlib.swiftmodule" Name="CxxStdlib.swiftmodule">
88+
</Directory>
8789
<Directory Id="Dispatch.swiftmodule" Name="Dispatch.swiftmodule">
8890
</Directory>
8991
<Directory Id="Foundation.swiftmodule" Name="Foundation.swiftmodule">
@@ -102,11 +104,6 @@
102104
</Directory>
103105
</Directory>
104106
</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>
110107
</Directory>
111108
<Directory Id="WindowsSDK_usr_share" Name="share">
112109
</Directory>
@@ -357,20 +354,20 @@
357354
<File Id="Cxx.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
358355
</Component>
359356

360-
<Component Id="swiftCxx.lib" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="a90ba944-b9f6-40a6-8184-f59ae23598fe">
361-
<File Id="swiftCxx.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\swiftCxx.lib" Checksum="yes" />
357+
<Component Id="libswiftCxx.lib" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="a90ba944-b9f6-40a6-8184-f59ae23598fe">
358+
<File Id="libswiftCxx.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\libswiftCxx.lib" Checksum="yes" />
362359
</Component>
363360
</ComponentGroup>
364361

365362
<ComponentGroup Id="CxxStdlib">
366363
<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" />
364+
<File Id="CxxStdlib.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\CxxStdlib.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
368365
</Component>
369366
<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" />
367+
<File Id="CxxStdlib.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\CxxStdlib.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
371368
</Component>
372369
<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" />
370+
<File Id="CxxStdlib.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\CxxStdlib.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
374371
</Component>
375372

376373
<Component Id="libswiftCxxStdlib.lib" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="654eedf7-cb83-4589-9c89-d12e8e53b9fa">

‎platforms/Windows/sdk-arm64.wxs

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@
8484
</Directory>
8585
<Directory Id="Cxx.swiftmodule" Name="Cxx.swiftmodule">
8686
</Directory>
87+
<Directory Id="CxxStdlib.swiftmodule" Name="CxxStdlib.swiftmodule">
88+
</Directory>
8789
<Directory Id="Dispatch.swiftmodule" Name="Dispatch.swiftmodule">
8890
</Directory>
8991
<Directory Id="Foundation.swiftmodule" Name="Foundation.swiftmodule">
@@ -102,11 +104,6 @@
102104
</Directory>
103105
</Directory>
104106
</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>
110107
</Directory>
111108
<Directory Id="WindowsSDK_usr_share" Name="share">
112109
</Directory>
@@ -357,20 +354,20 @@
357354
<File Id="Cxx.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
358355
</Component>
359356

360-
<Component Id="swiftCxx.lib" Directory="WindowsSDK_usr_lib_swift_windows_aarch64" Guid="f7bcc956-462e-43df-ae25-c5f4636b27d1">
361-
<File Id="swiftCxx.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\swiftCxx.lib" Checksum="yes" />
357+
<Component Id="libswiftCxx.lib" Directory="WindowsSDK_usr_lib_swift_windows_aarch64" Guid="f7bcc956-462e-43df-ae25-c5f4636b27d1">
358+
<File Id="libswiftCxx.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\libswiftCxx.lib" Checksum="yes" />
362359
</Component>
363360
</ComponentGroup>
364361

365362
<ComponentGroup Id="CxxStdlib">
366363
<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" />
364+
<File Id="CxxStdlib.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\CxxStdlib.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
368365
</Component>
369366
<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" />
367+
<File Id="CxxStdlib.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\CxxStdlib.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
371368
</Component>
372369
<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" />
370+
<File Id="CxxStdlib.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\CxxStdlib.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
374371
</Component>
375372

376373
<Component Id="libswiftCxxStdlib.lib" Directory="WindowsSDK_usr_lib_swift_windows_aarch64" Guid="b30a1c97-b8af-4877-ace8-c0c9ad5e55c8">

‎platforms/Windows/sdk-x86.wxs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@
8383
</Directory>
8484
<Directory Id="Cxx.swiftmodule" Name="Cxx.swiftmodule">
8585
</Directory>
86+
<Directory Id="CxxStdlib.swiftmodule" Name="CxxStdlib.swiftmodule">
87+
</Directory>
8688
<Directory Id="Dispatch.swiftmodule" Name="Dispatch.swiftmodule">
8789
</Directory>
8890
<Directory Id="Foundation.swiftmodule" Name="Foundation.swiftmodule">
@@ -103,7 +105,6 @@
103105
</Directory>
104106
<Directory Id="WindowsSDK_usr_lib_swift_static" Name="swift_static">
105107
<Directory Id="WindowsSDK_usr_lib_swift_static_windows" Name="windows">
106-
<Directory Id="CxxStdlib.swiftmodule" Name="CxxStdlib.swiftmodule" />
107108
</Directory>
108109
</Directory>
109110
</Directory>
@@ -355,20 +356,20 @@
355356
<File Id="Cxx.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftmodule" Checksum="yes" />
356357
</Component>
357358

358-
<Component Id="swiftCxx.lib" Directory="WindowsSDK_usr_lib_swift_windows_i686" Guid="b2897a7a-65c2-4f0f-b14c-6b466d2e3d34">
359-
<File Id="swiftCxx.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\swiftCxx.lib" Checksum="yes" />
359+
<Component Id="libswiftCxx.lib" Directory="WindowsSDK_usr_lib_swift_windows_i686" Guid="b2897a7a-65c2-4f0f-b14c-6b466d2e3d34">
360+
<File Id="libswiftCxx.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\libswiftCxx.lib" Checksum="yes" />
360361
</Component>
361362
</ComponentGroup>
362363

363364
<ComponentGroup Id="CxxStdlib">
364365
<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+
<File Id="CxxStdlib.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\CxxStdlib.swiftmodule\i686-unknown-windows-msvc.swiftdoc" Checksum="yes" />
366367
</Component>
367368
<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+
<File Id="CxxStdlib.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\CxxStdlib.swiftmodule\i686-unknown-windows-msvc.swiftinterface" Checksum="yes" />
369370
</Component>
370371
<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+
<File Id="CxxStdlib.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\CxxStdlib.swiftmodule\i686-unknown-windows-msvc.swiftmodule" Checksum="yes" />
372373
</Component>
373374

374375
<Component Id="libswiftCxxStdlib.lib" Directory="WindowsSDK_usr_lib_swift_windows_i686" Guid="f4342fea-b975-4e24-9881-8927d6ebb0fe">

0 commit comments

Comments
 (0)