Skip to content

WiX: adjust the packaging rules for the SPM runtime #464

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
Oct 8, 2025
+41 −29
Merged

WiX: adjust the packaging rules for the SPM runtime #464

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
70 changes: 41 additions & 29 deletions platforms/Windows/cli/cli.wxi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>

Copy link
Member

Choose a reason for hiding this comment

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

miscellaneous newline?

Copy link
Member Author

Choose a reason for hiding this comment

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

I just added that to have some space with the Include to match the other packages

<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">

<?if " '$(ProductArchitecture)' " == " 'arm64' "?>
<?define ModuleTriple = 'aarch64-unknown-windows-msvc' ?>
<?elseif " '$(ProductArchitecture)' " == " 'amd64' "?>
<?define ModuleTriple = 'x86_64-unknown-windows-msvc' ?>
<?endif?>

<Package
Language="1033"
Manufacturer="!(loc.ManufacturerName)"
Expand All @@ -22,8 +29,13 @@

<DirectoryRef Id="toolchain_$(VariantName)_usr_lib_swift">
<Directory Name="pm">
<Directory Id="toolchain_$(VariantName)_usr_lib_swift_pm_ManifestAPI" Name="ManifestAPI" />
<Directory Id="toolchain_$(VariantName)_usr_lib_swift_pm_PluginAPI" Name="PluginAPI" />
<Directory Id="toolchain_$(VariantName)_usr_lib_swift_pm_ManifestAPI" Name="ManifestAPI">
<Directory Id="CompilerPluginSupport.swiftmodule" Name="CompilerPluginSupport.swiftmodule" />
<Directory Id="PackageDescription.swiftmodule" Name="PackageDescription.swiftmodule" />
</Directory>
<Directory Id="toolchain_$(VariantName)_usr_lib_swift_pm_PluginAPI" Name="PluginAPI">
<Directory Id="PackagePlugin.swiftmodule" Name="PackagePlugin.swiftmodule" />
</Directory>
</Directory>
</DirectoryRef>

Expand Down Expand Up @@ -150,48 +162,48 @@
</Component>
</ComponentGroup>

<ComponentGroup Id="CompilerPluginSupport" Directory="toolchain_$(VariantName)_usr_lib_swift_pm_ManifestAPI">
<Component>
<ComponentGroup Id="CompilerPluginSupport">
<Component Directory="toolchain_$(VariantName)_usr_lib_swift_pm_ManifestAPI">
<File Source="$(ToolchainRoot)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.dll" />
</Component>
<Component>
<Component Directory="toolchain_$(VariantName)_usr_lib_swift_pm_ManifestAPI">
<File Source="$(ToolchainRoot)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.lib" />
</Component>
<Component>
<File Source="$(ToolchainRoot)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.swiftdoc" />
<Component Directory="CompilerPluginSupport.swiftmodule">
<File Source="$(ToolchainRoot)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.swiftmodule\$(ModuleTriple).swiftdoc" />
</Component>
<Component>
<File Source="$(ToolchainRoot)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.swiftmodule" />
<Component Directory="CompilerPluginSupport.swiftmodule">
<File Source="$(ToolchainRoot)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.swiftmodule\$(ModuleTriple).swiftinterface" />
</Component>
</ComponentGroup>

<ComponentGroup Id="PackageDescription" Directory="toolchain_$(VariantName)_usr_lib_swift_pm_ManifestAPI">
<Component>
<ComponentGroup Id="PackageDescription">
<Component Directory="toolchain_$(VariantName)_usr_lib_swift_pm_ManifestAPI">
<File Source="$(ToolchainRoot)\usr\lib\swift\pm\ManifestAPI\PackageDescription.dll" />
</Component>
<Component>
<Component Directory="toolchain_$(VariantName)_usr_lib_swift_pm_ManifestAPI">
<File Source="$(ToolchainRoot)\usr\lib\swift\pm\ManifestAPI\PackageDescription.lib" />
</Component>
<Component>
<File Source="$(ToolchainRoot)\usr\lib\swift\pm\ManifestAPI\PackageDescription.swiftdoc" />
<Component Directory="PackageDescription.swiftmodule">
<File Source="$(ToolchainRoot)\usr\lib\swift\pm\ManifestAPI\PackageDescription.swiftmodule\$(ModuleTriple).swiftdoc" />
</Component>
<Component>
<File Source="$(ToolchainRoot)\usr\lib\swift\pm\ManifestAPI\PackageDescription.swiftmodule" />
<Component Directory="PackageDescription.swiftmodule">
<File Source="$(ToolchainRoot)\usr\lib\swift\pm\ManifestAPI\PackageDescription.swiftmodule\$(ModuleTriple).swiftinterface" />
</Component>
</ComponentGroup>

<ComponentGroup Id="PackagePlugin" Directory="toolchain_$(VariantName)_usr_lib_swift_pm_PluginAPI">
<Component>
<ComponentGroup Id="PackagePlugin">
<Component Directory="toolchain_$(VariantName)_usr_lib_swift_pm_PluginAPI">
<File Source="$(ToolchainRoot)\usr\lib\swift\pm\PluginAPI\PackagePlugin.dll" />
</Component>
<Component>
<Component Directory="toolchain_$(VariantName)_usr_lib_swift_pm_PluginAPI">
<File Source="$(ToolchainRoot)\usr\lib\swift\pm\PluginAPI\PackagePlugin.lib" />
</Component>
<Component>
<File Source="$(ToolchainRoot)\usr\lib\swift\pm\PluginAPI\PackagePlugin.swiftdoc" />
<Component Directory="PackagePlugin.swiftmodule">
<File Source="$(ToolchainRoot)\usr\lib\swift\pm\PluginAPI\PackagePlugin.swiftmodule\$(ModuleTriple).swiftdoc" />
</Component>
<Component>
<File Source="$(ToolchainRoot)\usr\lib\swift\pm\PluginAPI\PackagePlugin.swiftmodule" />
<Component Directory="PackagePlugin.swiftmodule">
<File Source="$(ToolchainRoot)\usr\lib\swift\pm\PluginAPI\PackagePlugin.swiftmodule\$(ModuleTriple).swiftinterface" />
</Component>
</ComponentGroup>

Expand Down Expand Up @@ -653,11 +665,7 @@
</Component>
</ComponentGroup>

<ComponentGroup Id="package_manager" Directory="toolchain_$(VariantName)_usr_bin">
<ComponentGroupRef Id="CompilerPluginSupport" />
<ComponentGroupRef Id="PackageDescription" />
<ComponentGroupRef Id="PackagePlugin" />

<ComponentGroup Id="PackageManager" Directory="toolchain_$(VariantName)_usr_bin">
<Component>
<File Source="$(ToolchainRoot)\usr\bin\swift-build.exe" />
</Component>
Expand Down Expand Up @@ -741,7 +749,11 @@
<ComponentGroupRef Id="collections" />
<ComponentGroupRef Id="llbuild" />
<ComponentGroupRef Id="SwiftBuild" />
<ComponentGroupRef Id="package_manager" />
<ComponentGroupRef Id="PackageManager" />
<!-- Package Manager Manifest Runtime -->
<ComponentGroupRef Id="CompilerPluginSupport" />
Copy link
Member

Choose a reason for hiding this comment

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

Do we want to prefix these ID's so that it's clear that they are for the manifest runtime and not something else?

Copy link
Member Author

Choose a reason for hiding this comment

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

We can, though I'm not sure if that has much value - you wouldn't have these modules duplicated. We could create a ComponentGroup with the modules if you prefer.

<ComponentGroupRef Id="PackageDescription" />
<ComponentGroupRef Id="PackagePlugin" />

<ComponentGroupRef Id="DocC" />
<?if $(INCLUDE_SWIFT_DOCC) = True?>
Expand Down