rustbuild: Support cross rust-docs packages #32751
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @brson (rust_highfive has picked a reviewer for you, use r? to override) |
| let dst = distdir(build).join("doc").join(&build.package_vers); | ||
| t!(fs::create_dir_all(&dst)); | ||
| cp_r(&src, &dst); | ||
| } |
There was a problem hiding this comment.
Is this directory build/doc? If this is being done for all targets then won't they overwrite each other?
There was a problem hiding this comment.
Yeah this is build/doc, which I think is just what we upload to the S3 bucket, which in turn buildbot filters to just upload one of these? I was hoping the host == build.config.build would filter this build at least and we'd only copy one into place.
|
☔ The latest upstream changes (presumably #32767) made this pull request unmergeable. Please resolve the merge conflicts. |
Also helps provide context if it fails.
Building with `--target foo` should fail because that target wasn't actually validated.
Right now if you configure multiple hosts rustbuild will only build documentation for the build triple, but we've got all the support necessary to build documentation for different architectures as well. This commit reinterprets the `target` field of doc `Step` instances to be the target of the documentation rather than the target of the rustdoc/tool being run. This should enable `make dist` to start producing a bunch of `rust-docs` packages for all the cross architectures that rustbuild is producing now.
Not much new, just bringing everything along.
|
@bors r+ |
|
📌 Commit 5b29f9a has been approved by |
Manishearth
added a commit
to Manishearth/rust
that referenced
this pull request
Apr 8, 2016
Right now if you configure multiple hosts rustbuild will only build documentation for the build triple, but we've got all the support necessary to build documentation for different architectures as well. This commit reinterprets the `target` field of doc `Step` instances to be the target of the documentation rather than the target of the rustdoc/tool being run. This should enable `make dist` to start producing a bunch of `rust-docs` packages for all the cross architectures that rustbuild is producing now.
bors
added a commit
that referenced
this pull request
Apr 8, 2016
rustbuild: Support cross rust-docs packages Right now if you configure multiple hosts rustbuild will only build documentation for the build triple, but we've got all the support necessary to build documentation for different architectures as well. This commit reinterprets the `target` field of doc `Step` instances to be the target of the documentation rather than the target of the rustdoc/tool being run. This should enable `make dist` to start producing a bunch of `rust-docs` packages for all the cross architectures that rustbuild is producing now.
This was referenced Apr 9, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Right now if you configure multiple hosts rustbuild will only build
documentation for the build triple, but we've got all the support necessary to
build documentation for different architectures as well. This commit
reinterprets the
targetfield of docStepinstances to be the target of thedocumentation rather than the target of the rustdoc/tool being run.
This should enable
make distto start producing a bunch ofrust-docspackages for all the cross architectures that rustbuild is producing now.