Install the SwiftPM/Swift Build resources in /usr/share/pm #418
Conversation
There was a problem hiding this comment.
I'd rather that we explicitly list the files if possible. Do you expect the list to constantly change dramatically? The only place that we currently harvest is in the clang resources, which has continued to be a source of installation failures. I think that we should prefer to just enumerate the content that we are distributing.
|
I don't expect the list to change dramatically, but it is added to fairly often, and it's unfortunate if we have to stage cross-repo changes every time that happens |
owenv
force-pushed
the
owenv/swift-build-resources
branch
from
7db0a42 to
4b174e0
Compare
owenv
changed the title
|
I updated this patch to explicitly list everything and am autogenerating the content via scripts in the Swift Build repo |
owenv
force-pushed
the
owenv/swift-build-resources
branch
2 times, most recently
from
a9e92ae to
e1cb254
Compare
|
Built a toolchain in https://ci-external.swift.org/job/swift-PR-build-toolchain-windows/5885/ and confirmed all the content is installed to the correct location. @compnerd, do you have any concerns about landing this version of the installer changes? |
platforms/Windows/cli/cli.wxs
Outdated
| <ComponentGroupRef Id="SWBQNXPlatformResources" /> | ||
| <ComponentGroupRef Id="SWBUniversalPlatformResources" /> | ||
| <ComponentGroupRef Id="SWBWebAssemblyPlatformResources" /> | ||
| <ComponentGroupRef Id="SWBWindowsPlatformResources" /> |
There was a problem hiding this comment.
I think that SwiftBuild should be its own ComponentGroup. Is there a plan to merge SwiftBuild into SPM (not as a dependency but repository-wise)?
There was a problem hiding this comment.
I moved everything under the SwiftBuild component group for now. We might consider merging the repositories at some point but likely not in the near future
platforms/Windows/shared/shared.wxs
Outdated
| @@ -52,6 +52,16 @@ | |||
| <Directory Id="_usr_share_docc" Name="docc"> | |||
| <Directory Id="_usr_share_docc_render" Name="render" /> | |||
| </Directory> | |||
| <Directory Id="_usr_share_pm" Name="pm"> | |||
There was a problem hiding this comment.
Why is this in shared? I think that this should be in cli.wxs
There was a problem hiding this comment.
No particular reason, fixed it
owenv
force-pushed
the
owenv/swift-build-resources
branch
from
e1cb254 to
66728d6
Compare
|
Built a working toolchain with the latest changes in https://ci-external.swift.org/job/swift-PR-build-toolchain-windows/5888/. Installed content all looks correct. |
Builds on #417 - only the second commit is new
Ensure the Windows installer includes the resources bundled in swiftlang/swift-build#488