Ximin Luo [Tue, 11 Apr 2017 18:06:04 +0000 (20:06 +0200)]
Remove the deps directory, we're now storing that in 'upstream' instead
`gbp import-orig` now supports component tarballs, and this workflow prefers
to store them in the upstream branch. Now, we need to get rid of deps/ in this
branch so that they aren't mistaken for debian-specific changes.
bors [Fri, 3 Mar 2017 19:21:26 +0000 (19:21 +0000)]
Auto merge of #3781 - alexcrichton:beta-backport, r=alexcrichton
[backport] Fix deps with `cargo test --all` and doctests
This commit fixes `cargo test --all` with the way we ship libraries to `rustdoc
--test`. I'm... not entirely sure what the previous incarnation was doing but
the current organization is to interpret `compilation.libraries` as a mapping
from a package to the list of crates it needs to link to test.
This updates the support in `cargo_rustc/mod.rs` to create the map appropriately
and tweaks the loop in `cargo_test.rs` as well.
Zack M. Davis [Wed, 1 Feb 2017 04:51:24 +0000 (20:51 -0800)]
make build tests not depend on minutiæ of rustc output
This little patch arises from the maelstrom of my purity born of pain.
It's the pain of seeing rust-lang/rust#38103 in its perfect
crystalline beauty waste away on page four of
https://github.com/rust-lang/rust/pulls, waiting, ready, itching to
land, dying with anticipation to bring the light of clearer lint group
error messages to Rust users of all creeds and nations, only for its
promise to be cruelly blocked by the fateful, hateful hand of circular
dependency. For it is written in src/tools/cargotest/main.rs that the
Cargo tests must pass before the PR can receive Appveyor's blessing,
but the Cargo tests could not pass (because they depend on fine
details of the output that the PR is meant to change), and the Cargo
tests could not be changed (because updating the test expectation to
match the proposed new compiler output, would fail with the current
compiler).
The Gordian knot is cut in the bowels of cargotest's very notion of
comparison (of JSON objects) itself, by means of introducing a magic
string literal `"{...}"`, which can server as a wildcard for any JSON
sub-object.
And so it will be for the children, and the children's children, and
unto the 1.17.0 and 1.18.0 releases, that Cargo's build test
expectations will faithfully expect the exact JSON output by Cargo
itself, but the string literal `"{...}"` shall be a token upon the
JSON output by rustc, and when I see `"{...}"`, I will pass over you,
and the failure shall not be upon you.
Alex Crichton [Thu, 16 Feb 2017 16:04:09 +0000 (08:04 -0800)]
Fix deps with `cargo test --all` and doctests
This commit fixes `cargo test --all` with the way we ship libraries to `rustdoc
--test`. I'm... not entirely sure what the previous incarnation was doing but
the current organization is to interpret `compilation.libraries` as a mapping
from a package to the list of crates it needs to link to test.
This updates the support in `cargo_rustc/mod.rs` to create the map appropriately
and tweaks the loop in `cargo_test.rs` as well.
With the new `rust-slave-linux-cross:2017-02-02`, powerpc64 no longer
uses gcc-5. I updated the `Dockerfile` at the time to reflect this, but
missed `OPENSSL_CC_powerpc64-unknown-linux-gnu` in `Makefile.in`.
Josh Stone [Sat, 4 Feb 2017 01:59:30 +0000 (17:59 -0800)]
Update OPENSSL_CC_powerpc64-unknown-linux-gnu
With the new `rust-slave-linux-cross:2017-02-02`, powerpc64 no longer
uses gcc-5. I updated the `Dockerfile` at the time to reflect this, but
missed `OPENSSL_CC_powerpc64-unknown-linux-gnu` in `Makefile.in`.
bors [Tue, 31 Jan 2017 03:20:49 +0000 (03:20 +0000)]
Auto merge of #3618 - sbeckeriv:3473-new-subcommand-doc-update, r=alexcrichton
Update new command help doc
Resolves #3473
Dearest reviewer,
I hope that all is well in rustland. I was reviewing some open issues
and saw this update to the help text for the new command. I have added
the suggested help text from issue #3473. I formated to the message to
match the publish bin's job flag.
I hope that all is well in rustland. I was reviewing some open issues
and saw this update to the help text for the new command. I have added
the suggested help text from issue #3473. I formated to the message to
match the publish bin's job flag.
bors [Sun, 29 Jan 2017 02:06:47 +0000 (02:06 +0000)]
Auto merge of #3604 - froydnj:rich-version-info, r=alexcrichton
implement `cargo --version --verbose`
As suggested in #3584. This is a bit underwhelming, and I'm unsure if some of the complexity in froydnj/cargo@775c900 is really warranted, but this series gets the job done. Sample output when building with `configure` and `make`:
bors [Sat, 28 Jan 2017 00:35:00 +0000 (00:35 +0000)]
Auto merge of #3593 - Susurrus:master, r=alexcrichton
Improve error for dependencies that don't have the same source paths
I've added an additional test case which is how my project compiled. Part of the issue was that I didn't know that each dependency needs to use the same path for all build targets. The previous error message was unclear both in what was going on and how to resolve it. The new error message should be more clear.
bors [Fri, 27 Jan 2017 22:55:06 +0000 (22:55 +0000)]
Auto merge of #3557 - raphlinus:master, r=alexcrichton
Add dep-info generation
Work in progress: add a --dep-info flag to cargo build (and also
rustc) that outputs dependency information in a form compatible with
make and ninja, to a specified file. This will help in integrating
into other build systems.
Nathan Froyd [Fri, 27 Jan 2017 16:39:17 +0000 (11:39 -0500)]
export rich version information from cargo::version
To support `cargo --version --verbose`, ala rustc, we need more
information to be injected into cargo when it's built from the Makefile,
and a more explicit data structure to be returned from cargo::version.
We implement fmt::Display for our newly-created structure so clients
don't have to bother with the details of interpreting the structure if
all they want is a string.
bors [Thu, 26 Jan 2017 22:27:33 +0000 (22:27 +0000)]
Auto merge of #3597 - Susurrus:badge_docs, r=alexcrichton
Add gitlab to the supported services for AppVeyor badges.
This is undocumented but supported behavior for AppVeyor. I have already done this with a crate I own and the badge works on both the AppVeyor and crates.io end.
Raph Levien [Tue, 17 Jan 2017 21:22:05 +0000 (13:22 -0800)]
Add dep-info generation
Make cargo output a ".d" file containing dependency info (in a format
that make and ninja can consume) for each artifact it produces. This
will help in integrating into other build systems.
bors [Fri, 20 Jan 2017 18:48:12 +0000 (18:48 +0000)]
Auto merge of #3554 - bmwiedemann:patch-1, r=alexcrichton
make build reproducible
see https://reproducible-builds.org/ for why this is good
and https://wiki.debian.org/ReproducibleBuilds/TimestampsProposal#Bash_.2F_POSIX_shell for variants that also work on BSD
bors [Thu, 19 Jan 2017 23:43:24 +0000 (23:43 +0000)]
Auto merge of #3565 - integer32llc:fix-gh-pages, r=alexcrichton
Fix doc publishing: Remove $USER from the --user argument from pip install
[This looks to be the cause of why docs aren't publishing to gh-pages](https://travis-ci.org/rust-lang/cargo/jobs/193507734#L1059). I was able to publish the docs to [my repo's gh-pages](https://integer32llc.github.io/cargo/) with this change (and setting my own secure gh-token).
It looks like this problem got introduced [in this commit](https://github.com/rust-lang/cargo/commit/dc15ca5d202d6d10f6be45f388759a902723de6c). I don't really know python/pip, but `$USER` wasn't there before and [Travis' docs just say `--user`](https://docs.travis-ci.com/user/languages/python/#pip).