Skip to content
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

WiX: adjust manifest for static conversion #373

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+0 −9
Open

WiX: adjust manifest for static conversion #373

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
9 changes: 0 additions & 9 deletions platforms/Windows/cli/cli.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,12 +207,6 @@
<Component>
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\Commands.dll" />
</Component>
<Component>
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\CoreCommands.dll" />
</Component>
<Component>
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\DriverSupport.dll" />
</Component>
<Component>
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\PackageGraph.dll" />
</Component>
Expand All @@ -222,9 +216,6 @@
<Component>
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\PackageModel.dll" />
</Component>
<Component>
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\PackageModelSyntax.dll" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like PackageModelSyntax is still able to go either way in https://github.com/swiftlang/swift-package-manager/pull/8268/files and https://github.com/swiftlang/swift-package-manager/blob/2215d098ed2aa991ed3f3d8c712266f14ebe4b45/Sources/PackageModelSyntax/CMakeLists.txt#L9

Does that PR need to switch it to a static archive, or are you switching things to use -DBUILD_SHARED_LIBS=NO?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch! That should still be dynamic - I believe it ended up being that this was not profitable.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wait, no: swiftlang/swift-package-manager#8268

That does change PackageModelSyntax to be static, along with SwiftSDKCommand, DriverSupport.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, now it does.

</Component>
<Component>
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SourceControl.dll" />
</Component>
Expand Down