Rust installer v2 #20317
Rust installer v2 #20317
Conversation
This distributes docs in a separate package called rust-docs. The rust-packaging project will combine it with Rust and Cargo into a single installer in a variety of formats.
These work, but aren't being built and uploaded because the bots run 'distcheck' not 'dist'.
This puts stdc++ and the unwinding dll into the main package and creates a separate rust-mingw package for everything else.
|
It would be nice to review https://github.com/rust-lang/rust-installer as well since there's a bunch of new shell script there, but I know that's pretty arduous. |
|
Also fixes #17690 |
|
cc @vadimcn |
| $$(Q)rm -R tmp/dist/$$(PKG_NAME)-$(1)-image | ||
|
|
||
| dist-doc-install-dir-$(1): docs compiler-docs | ||
| $$(Q)mkdir -p tmp/dist/$$(DOC_PKG_NAME)-$(1)-image/share/doc/rust | ||
| $$(Q)cp -r doc tmp/dist/$$(DOC_PKG_NAME)-$(1)-image/share/doc/rust/html |
There was a problem hiding this comment.
Above this used to be [ ! -d doc ] || ... , was it intentional to lose the prefix?
There was a problem hiding this comment.
Ah, I believe this is handled below.
There was a problem hiding this comment.
Yeah, it's handled with ifdefs somewhere else.
|
I looked over rust-lang/rust-installer@47efd6b and https://github.com/rust-lang/rust-installer, but sadly not in incredible detail. I'm pretty happy with everything I've seen so far though, and it sounds like you've been testing everywhere as you go along, so I'm pretty confident in this. r=me with just a few nits. |
Needs to merge directly after rust-lang/rust#20317
This upgrades to a version of rust-installer that supports multiple 'components', so that the output can be combined into a single installer that contains both Rust and Cargo (#16456).
At the same time it also packages documentation into a component called 'rust-docs', which will again be merged into the combined installer (#14916).
It creates yet another component, 'rust-mingw', to carry the optional parts of mingw necessary to link with Rust on windows, and makes distcheck build all these installer components for upload by the buildbots. It also moves the 'third-party' docs from the 'bin/' folder to 'share/doc/rust' where the rest of the docs live, temporarily removing them from the .exe installer.
This needs to be merged at roughly the same time as the corresponding Cargo PR.
Next steps:
r? @alexcrichton p=1 please. There's a lot more to do here.