Auto merge of #1831 - alexcrichton:publish-cargo, r=huonw

This commit tweaks some metadata here and there to publish Cargo on crates.io.

* License fields are added to Cargo.tomls
* `registry` was renamed to `crates-io`
* API docs for the `cargo` crate are now generated via `make doc`

Author: bors

Cargo.lock

@@ -4,6 +4,13 @@ version = "0.4.0"
 authors = ["Yehuda Katz <[email protected]>",
            "Carl Lerche <[email protected]>",
            "Alex Crichton <[email protected]>"]
+license = "MIT/Apache-2.0"
+homepage = "https://crates.io"
+repository = "https://github.com/rust-lang/cargo"
+documentation = "http://doc.crates.io"
+description = """
+Cargo, a package manager for Rust.
+"""
 
 [lib]
 name = "cargo"
@@ -25,7 +32,7 @@ libgit2-sys = "0.2"
 log = "0.3"
 num_cpus = "0.2"
 regex = "0.1"
-registry = { path = "src/registry" }
+crates-io = { path = "src/crates-io", version = "0.1" }
 rustc-serialize = "0.3"
 semver = "0.1"
 tar = { version = "0.2", features = ["nightly"] }
@@ -38,7 +45,7 @@ winapi = "0.2"
 
 [dev-dependencies]
 tempdir = "0.3"
-hamcrest = { git = "https://github.com/carllerche/hamcrest-rust.git" }
+hamcrest = "0.1"
 bufstream = "0.1"
 filetime = "0.1"
 

Cargo.toml

@@ -133,7 +133,11 @@ ASSETS := CNAME images/noise.png images/forkme.png images/Cargo-Logo-Small.png \
 	images/search.png
 
 doc: $(foreach doc,$(DOCS),target/doc/$(doc).html) \
-	$(foreach asset,$(ASSETS),target/doc/$(asset))
+	$(foreach asset,$(ASSETS),target/doc/$(asset)) \
+	target/doc/cargo/index.html
+
+target/doc/cargo/index.html:
+	$(CARGO) doc --no-deps
 
 $(DOC_DIR)/%.html: src/doc/%.md src/doc/header.html src/doc/footer.html
 	@mkdir -p $(@D)

Makefile.in

@@ -3,6 +3,7 @@
 
 #[cfg(test)] extern crate hamcrest;
 #[macro_use] extern crate log;
+extern crate crates_io as registry;
 extern crate curl;
 extern crate docopt;
 extern crate filetime;
@@ -13,7 +14,6 @@ extern crate libc;
 extern crate libgit2_sys;
 extern crate num_cpus;
 extern crate regex;
-extern crate registry;
 extern crate rustc_serialize;
 extern crate semver;
 extern crate tar;

src/cargo/lib.rs

@@ -0,0 +1,17 @@
+[package]
+name = "crates-io"
+version = "0.1.0"
+authors = ["Alex Crichton <[email protected]>"]
+license = "MIT/Apache-2.0"
+repository = "https://github.com/rust-lang/cargo"
+description = """
+Helpers for interacting with crates.io
+"""
+
+[lib]
+name = "crates_io"
+path = "lib.rs"
+
+[dependencies]
+curl = "0.2"
+rustc-serialize = "0.3"