diff options
| -rw-r--r-- | README.md | 13 | ||||
| -rw-r--r-- | mk/dist.mk | 21 | ||||
| -rw-r--r-- | src/doc/trpl/installing-rust.md | 6 | ||||
| m--------- | src/rust-installer | 0 |
4 files changed, 16 insertions, 24 deletions
diff --git a/README.md b/README.md index 605c2fc9a61..9d7c939ff9d 100644 --- a/README.md +++ b/README.md @@ -5,16 +5,10 @@ documentation. ## Quick Start -1. Download a [binary installer][installer] for your platform. -2. Read [The Rust Programming Language][trpl]. -3. Enjoy! +Read ["Installing Rust"][install] from [The Book][trpl]. -> ***Note:*** Windows users can read the detailed -> [using Rust on Windows][win-wiki] notes on the wiki. - -[installer]: http://www.rust-lang.org/install.html +[install]: http://doc.rust-lang.org/book/installing-rust.html [trpl]: http://doc.rust-lang.org/book/index.html -[win-wiki]: https://github.com/rust-lang/rust/wiki/Using-Rust-on-Windows ## Building from Source @@ -52,8 +46,6 @@ documentation. When complete, `make install` will place several programs into `/usr/local/bin`: `rustc`, the Rust compiler, and `rustdoc`, the API-documentation tool. -3. Read [The Rust Programming Language][trpl]. -4. Enjoy! ### Building on Windows @@ -81,7 +73,6 @@ $ pacman -S base-devel [repo]: https://github.com/rust-lang/rust [tarball]: https://static.rust-lang.org/dist/rustc-nightly-src.tar.gz -[trpl]: http://doc.rust-lang.org/book/index.html ## Notes diff --git a/mk/dist.mk b/mk/dist.mk index 05af3f21232..831225556f3 100644 --- a/mk/dist.mk +++ b/mk/dist.mk @@ -109,8 +109,6 @@ distcheck-tar-src: dist-tar-src # Unix binary installer tarballs ###################################################################### -NON_INSTALLED_PREFIXES=COPYRIGHT,LICENSE-APACHE,LICENSE-MIT,README.md,version - define DEF_INSTALLER $$(eval $$(call DEF_PREPARE,dir-$(1))) @@ -124,19 +122,23 @@ dist-install-dir-$(1): PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD) dist-install-dir-$(1): PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD) dist-install-dir-$(1): PREPARE_CLEAN=true dist-install-dir-$(1): prepare-base-dir-$(1) docs compiler-docs - $$(Q)$$(PREPARE_MAN_CMD) $$(S)COPYRIGHT $$(PREPARE_DEST_DIR) - $$(Q)$$(PREPARE_MAN_CMD) $$(S)LICENSE-APACHE $$(PREPARE_DEST_DIR) - $$(Q)$$(PREPARE_MAN_CMD) $$(S)LICENSE-MIT $$(PREPARE_DEST_DIR) - $$(Q)$$(PREPARE_MAN_CMD) $$(S)README.md $$(PREPARE_DEST_DIR) $$(Q)mkdir -p $$(PREPARE_DEST_DIR)/share/doc/rust $$(Q)$$(PREPARE_MAN_CMD) $$(S)COPYRIGHT $$(PREPARE_DEST_DIR)/share/doc/rust $$(Q)$$(PREPARE_MAN_CMD) $$(S)LICENSE-APACHE $$(PREPARE_DEST_DIR)/share/doc/rust $$(Q)$$(PREPARE_MAN_CMD) $$(S)LICENSE-MIT $$(PREPARE_DEST_DIR)/share/doc/rust $$(Q)$$(PREPARE_MAN_CMD) $$(S)README.md $$(PREPARE_DEST_DIR)/share/doc/rust + +prepare-overlay-$(1): + $$(Q)rm -Rf tmp/dist/$$(PKG_NAME)-$(1)-overlay + $$(Q)mkdir -p tmp/dist/$$(PKG_NAME)-$(1)-overlay + $$(Q)cp $$(S)COPYRIGHT tmp/dist/$$(PKG_NAME)-$(1)-overlay/ + $$(Q)cp $$(S)LICENSE-APACHE tmp/dist/$$(PKG_NAME)-$(1)-overlay/ + $$(Q)cp $$(S)LICENSE-MIT tmp/dist/$$(PKG_NAME)-$(1)-overlay/ + $$(Q)cp $$(S)README.md tmp/dist/$$(PKG_NAME)-$(1)-overlay/ # This tiny morsel of metadata is used by rust-packaging - $$(Q)echo "$(CFG_VERSION)" > $$(PREPARE_DEST_DIR)/version + $$(Q)echo "$(CFG_VERSION)" > tmp/dist/$$(PKG_NAME)-$(1)-overlay/version -dist/$$(PKG_NAME)-$(1).tar.gz: dist-install-dir-$(1) +dist/$$(PKG_NAME)-$(1).tar.gz: dist-install-dir-$(1) prepare-overlay-$(1) @$(call E, build: $$@) # Copy essential gcc components into installer ifdef CFG_WINDOWSY_$(1) @@ -146,13 +148,12 @@ ifdef CFG_WINDOWSY_$(1) endif $$(Q)$$(S)src/rust-installer/gen-installer.sh \ --product-name=Rust \ - --verify-bin=rustc \ --rel-manifest-dir=rustlib \ --success-message=Rust-is-ready-to-roll. \ --image-dir=tmp/dist/$$(PKG_NAME)-$(1)-image \ --work-dir=tmp/dist \ --output-dir=dist \ - --non-installed-prefixes=$$(NON_INSTALLED_PREFIXES) \ + --non-installed-overlay=tmp/dist/$$(PKG_NAME)-$(1)-overlay \ --package-name=$$(PKG_NAME)-$(1) \ --component-name=rustc \ --legacy-manifest-dirs=rustlib,cargo diff --git a/src/doc/trpl/installing-rust.md b/src/doc/trpl/installing-rust.md index 80288c4c3d9..5bc33d0a232 100644 --- a/src/doc/trpl/installing-rust.md +++ b/src/doc/trpl/installing-rust.md @@ -24,11 +24,11 @@ installer](https://static.rust-lang.org/dist/rust-nightly-x86_64-pc-windows-gnu. and run it. If you decide you don't want Rust anymore, we'll be a bit sad, but that's okay. -Not every programming language is great for everyone. Just pass an argument to -the script: +Not every programming language is great for everyone. Just run the uninstall +script: ```bash -$ curl -s https://static.rust-lang.org/rustup.sh | sudo sh -s -- --uninstall +$ sudo /usr/local/lib/rustlib/uninstall.sh ``` If you used the Windows installer, just re-run the `.exe` and it will give you diff --git a/src/rust-installer b/src/rust-installer -Subproject e577c97b494be2815b215e3042207d6d4b7c551 +Subproject 60fd8abfcae50629a3fc664bd809238fed03961 |