Skip to content

WiX: adjust the packaging for CxxStdlib #237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 30, 2023
Merged

WiX: adjust the packaging for CxxStdlib #237

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions platforms/Windows/sdk/sdk.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
<Directory Id="_StringProcessing.swiftmodule" Name="_StringProcessing.swiftmodule" />
<Directory Id="CRT.swiftmodule" Name="CRT.swiftmodule" />
<Directory Id="Cxx.swiftmodule" Name="Cxx.swiftmodule" />
<Directory Id="CxxStdlib.swiftmodule" Name="CxxStdlib.swiftmodule" />
<Directory Id="Distributed.swiftmodule" Name="Distributed.swiftmodule" />
<Directory Id="Dispatch.swiftmodule" Name="Dispatch.swiftmodule" />
<Directory Id="Foundation.swiftmodule" Name="Foundation.swiftmodule" />
Expand All @@ -96,11 +97,6 @@
<Directory Id="WindowsSDK_usr_lib_swift_windows_ARCH" Name="$(ArchArchDir)" />
</Directory>
</Directory>
<Directory Name="swift_static">
<Directory Id="WindowsSDK_usr_lib_swift_static_windows" Name="windows">
<Directory Id="CxxStdlib.swiftmodule" Name="CxxStdlib.swiftmodule" />
</Directory>
</Directory>
</Directory>
<Directory Id="WindowsSDK_usr_share" Name="share" />
</Directory>
Expand Down Expand Up @@ -316,13 +312,13 @@

<ComponentGroup Id="CxxStdlib" Directory="CxxStdlib.swiftmodule">
<Component>
<File Source="$(SDK_ROOT)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\$(ArchTriple).swiftdoc" />
<File Source="$(SDK_ROOT)\usr\lib\swift\windows\CxxStdlib.swiftmodule\$(ArchTriple).swiftdoc" />
</Component>
<Component>
<File Source="$(SDK_ROOT)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\$(ArchTriple).swiftinterface" />
<File Source="$(SDK_ROOT)\usr\lib\swift\windows\CxxStdlib.swiftmodule\$(ArchTriple).swiftinterface" />
</Component>
<Component>
<File Source="$(SDK_ROOT)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\$(ArchTriple).swiftmodule" />
<File Source="$(SDK_ROOT)\usr\lib\swift\windows\CxxStdlib.swiftmodule\$(ArchTriple).swiftmodule" />
</Component>
<Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
<File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(ArchArchDir)\libswiftCxxStdlib.lib" />
Expand Down