Update for new upstream build infrastructure.

* Cargo and offline docs included by default in rust-nightly-bin.
* Retire cargo-nightly-bin (marked as a conflict).

Closes #9
Closes #11

Author: michaelsproul

Makefile

@@ -1,24 +1,19 @@
 rust_makefile=https://raw.githubusercontent.com/mozilla/rust/master/mk/main.mk
-cargo_makefile=https://raw.githubusercontent.com/rust-lang/cargo/master/Makefile.in
 
-default: rust-src-pkg cargo-src-pkg
+default: rust-src-pkg
 
 # Upload
-upload: rust-upload cargo-upload
+upload: rust-upload
 
 %-upload: %-src-pkg
 	burp $*-nightly-bin-*.src.tar.gz
 
 # Binary packages
-bin-pkgs: rust-bin-pkg cargo-bin-pkg
-
 %-bin-pkg: %.pkgbuild
 	makepkg -p $<
 	rm -rf pkg src
 
 # Source packages
-source-pkgs: rust-src-pkg cargo-src-pkg
-
 %-src-pkg: %.pkgbuild
 	mkaurball -p $< -f
 	@rm -f $*.xml

README.md

@@ -3,17 +3,18 @@ Rust & Cargo Nightly
 
 PKGBUILD generator for Arch Linux that makes installing the nightly Rust & Cargo builds easy.
 
-This code is run every 24 hours and updates the following AUR packages:
+This code is run every 24 hours (at 02:30 UTC) and updates the following AUR package:
 
-* Rust: https://aur.archlinux.org/packages/rust-nightly-bin/
-* Cargo: https://aur.archlinux.org/packages/cargo-nightly-bin/
+https://aur.archlinux.org/packages/rust-nightly-bin/
 
-The Rust package includes the compiler and a MIME type for Rust source code.
+## Components
 
-## Update Times
+The AUR package includes the following resources:
 
-* Rust: 02:30 UTC
-* Cargo: 16:00 UTC
+* The Rust compiler, `rustc`.
+* Cargo, the Rust package manager.
+* Offline HTML documentation, available [here](file:///usr/local/share/doc/rust/html/index.html)
+* A `.rs` MIME type for Rust source code.
 
 ## Syntax Highlighting
 

templates/cargo.pkgbuild

@@ -6,13 +6,13 @@ pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='A safe, concurrent, practical language from Mozilla.'
 url='http://www.rust-lang.org/'
-provides='rust'
-conflicts=('rust' 'rust-git' 'rust-nightly')
+provides=('rust' 'cargo')
+conflicts=('rust' 'rust-git' 'rust-nightly' 'cargo-nightly-bin')
 depends=('shared-mime-info')
 license=('MIT' 'Apache')
 source=("https://static.rust-lang.org/dist/rust-nightly-${CARCH}-unknown-linux-gnu.tar.gz"
         'https://raw.githubusercontent.com/rust-lang/rust/master/src/etc/gedit/share/mime/packages/rust.xml'
-        "rust-nightly.conf")
+        'rust-nightly.conf')
 sha256sums=('SKIP' 'SKIP' 'SKIP')
 install=rust.install
 options=(staticlibs !strip)
@@ -21,28 +21,23 @@ package() {
     local INSTALL_DIR=/usr/local
     local MAN_DIR=/usr/local/man
 
-    # Rust
+    # Rust, Cargo and Documentation.
     cd rust-nightly-${CARCH}-unknown-linux-gnu
     ./install.sh --prefix=${pkgdir}${INSTALL_DIR} --mandir=${pkgdir}${MAN_DIR}
 
-    # Docs
-    # local DOC_DIR=${pkgdir}${INSTALL_DIR}/share/doc/rust/html
-    # echo "Copying HTML docs to ${DOC_DIR}"
-    # mkdir -p ${DOC_DIR}
-    # cp -r doc/* ${DOC_DIR}
+    # Fix doc permissions.
+    local DOC_DIR=${pkgdir}${INSTALL_DIR}/share/doc/rust/html
+    find ${DOC_DIR} -type f -exec chmod 644 {} ';'
+    find ${DOC_DIR} -type d -exec chmod 775 {} ';'
 
-    # echo "Setting permissions on docs."
-    # find ${DOC_DIR} -type f -exec chmod 644 {} ';'
-    # find ${DOC_DIR} -type d -exec chmod 775 {} ';'
-
-    # MIME type association
+    # Establish .rs MIME type association.
     mkdir -p "${pkgdir}/usr/share/mime/packages"
     install -m 644 "${srcdir}/rust.xml" "${pkgdir}/usr/share/mime/packages/rust.xml"
 
-    # Dynamic library configuration (no LD_LIBRARY_PATH required).
+    # Dynamic linker configuration (no LD_LIBRARY_PATH required).
     mkdir -p "${pkgdir}/etc/ld.so.conf.d"
     install -m 644 "${srcdir}/rust-nightly.conf" "${pkgdir}/etc/ld.so.conf.d/rust-nightly.conf"
 
-    # remove manifest file referencing $pkgdir
+    # Remove manifest file referencing $pkgdir.
     rm -f "${pkgdir}/usr/local/lib/rustlib/manifest-rustc"
 }