---

yaml
---
r: 110270
b: refs/heads/try
c: bec333c
h: refs/heads/master
v: v3

Author: alexcrichton

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: e415c25bcd81dc1f9a5a3d25d9b48ed2d545336b
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: c7fac4471201977fdb1c0c0a26c87287e12dc644
-refs/heads/try: 8610e4a7a0782c9407d9b9ac22de267a14f99b23
+refs/heads/try: bec333c4bc9d414c7f393adfdb8d8ab2d394bb37
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/.gitattributes

@@ -5,6 +5,7 @@
 *.h rust
 *.rs rust
 src/etc/pkg/rust-logo.ico binary
+src/etc/pkg/rust-logo.png binary
 src/rt/msvc/* -whitespace
 src/rt/vg/* -whitespace
 src/rt/jemalloc/**/* -whitespace

branches/try/configure

@@ -384,7 +384,6 @@ opt pax-flags 0 "apply PaX flags to rustc binaries (required for GRSecurity/PaX-
 opt inject-std-version 1 "inject the current compiler version of libstd into programs"
 opt rpath 1 "build rpaths into rustc itself"
 opt nightly 0 "build nightly packages"
-opt verify-install 1 "verify installed binaries work"
 valopt prefix "/usr/local" "set installation prefix"
 valopt local-rust-root "/usr/local" "set prefix for local rust binary"
 valopt llvm-root "" "set LLVM root"

branches/try/mk/dist.mk

@@ -160,12 +160,27 @@ dist-prepare-osx-$(1): PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD)
 dist-prepare-osx-$(1): PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD)
 dist-prepare-osx-$(1): prepare-base-osx-$(1)
 
-dist/$(PKG_NAME)-$(1).pkg: $(S)src/etc/pkg/Distribution.xml LICENSE.txt dist-prepare-osx-$(1)
+dist/$(PKG_NAME)-$(1).pkg: $(S)src/etc/pkg/Distribution.xml LICENSE.txt \
+		dist-prepare-osx-$(1) \
+		tmp/dist/pkgres-$(1)/LICENSE.txt \
+		tmp/dist/pkgres-$(1)/welcome.rtf \
+		tmp/dist/pkgres-$(1)/rust-logo.png
 	@$$(call E, making OS X pkg)
 	$(Q)pkgbuild --identifier org.rust-lang.rust --root tmp/dist/pkgroot-$(1) rust.pkg
-	$(Q)productbuild --distribution $(S)src/etc/pkg/Distribution.xml --resources . dist/$(PKG_NAME)-$(1).pkg
+	$(Q)productbuild --distribution $(S)src/etc/pkg/Distribution.xml \
+	      --resources tmp/dist/pkgres-$(1) dist/$(PKG_NAME)-$(1).pkg
 	$(Q)rm -rf tmp rust.pkg
 
+tmp/dist/pkgres-$(1)/LICENSE.txt: $(S)/LICENSE.txt
+	@$$(call E,pkg resource LICENSE.txt)
+	$(Q)mkdir -p $$(@D)
+	$(Q)cp $$< $$@
+
+tmp/dist/pkgres-$(1)/%: $(S)src/etc/pkg/%
+	@$$(call E,pkg resource $$*)
+	$(Q)mkdir -p $$(@D)
+	$(Q)cp -r $$< $$@
+
 endef
 
 $(foreach host,$(CFG_HOST),$(eval $(call DEF_OSX_PKG,$(host))))

branches/try/mk/docs.mk

@@ -232,7 +232,7 @@ ifeq ($(CFG_LLNEXTGEN),)
 else
 .PHONY: verify-grammar
 
-doc/rust.g: $(D)/rust.md $(S)src/etc/extract_grammar.py
+doc/rust.g: rust.md $(S)src/etc/extract_grammar.py
 	@$(call E, extract_grammar: $@)
 	$(Q)$(CFG_PYTHON) $(S)src/etc/extract_grammar.py $< >$@
 

branches/try/mk/install.mk

@@ -8,21 +8,14 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-ifdef CFG_DISABLE_VERIFY_INSTALL
-MAYBE_DISABLE_VERIFY=--disable-verify
-else
-MAYBE_DISABLE_VERIFY=
-endif
 
 install: dist-install-dir-$(CFG_BUILD)
-	$(Q)sh tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)"
+	$(Q)sh tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(CFG_PREFIX)" --libdir="$(CFG_LIBDIR)" --mandir="$(CFG_MANDIR)"
 # Remove tmp files while we can because they may have been created under sudo
 	$(Q)rm -R tmp/dist/$(PKG_NAME)-$(CFG_BUILD)
 
 uninstall: dist-install-dir-$(CFG_BUILD)
-	$(Q)sh tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)"
-# Remove tmp files while we can because they may have been created under sudo
-	$(Q)rm -R tmp/dist/$(PKG_NAME)-$(CFG_BUILD)
+	$(Q)sh tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(CFG_PREFIX)" --libdir="$(CFG_LIBDIR)" --mandir="$(CFG_MANDIR)"
 
 
 ######################################################################

branches/try/src/compiletest/compiletest.rs

@@ -8,11 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![crate_type = "bin"]
-#![feature(phase)]
+#[crate_type = "bin"];
+#[feature(phase)];
 
-#![allow(non_camel_case_types)]
-#![deny(warnings)]
+#[allow(non_camel_case_types)];
+#[deny(warnings)];
 
 extern crate test;
 extern crate getopts;

branches/try/src/doc/rust.md

@@ -153,7 +153,7 @@ Some productions are defined by exclusion of particular Unicode characters:
 ~~~~ {.notrust .ebnf .gram}
 comment : block_comment | line_comment ;
 block_comment : "/*" block_comment_body * '*' + '/' ;
-block_comment_body : [block_comment | character] * ;
+block_comment_body : (block_comment | character) * ;
 line_comment : "//" non_eol * ;
 ~~~~
 
@@ -205,7 +205,6 @@ The keywords are the following strings:
 ~~~~ {.notrust .keyword}
 as
 break
-crate
 do
 else enum extern
 false fn for
@@ -497,16 +496,16 @@ All of the above extensions are expressions with values.
 ## Macros
 
 ~~~~ {.notrust .ebnf .gram}
-expr_macro_rules : "macro_rules" '!' ident '(' macro_rule * ')' ;
-macro_rule : '(' matcher * ')' "=>" '(' transcriber * ')' ';' ;
+expr_macro_rules : "macro_rules" '!' ident '(' macro_rule * ')'
+macro_rule : '(' matcher * ')' "=>" '(' transcriber * ')' ';'
 matcher : '(' matcher * ')' | '[' matcher * ']'
         | '{' matcher * '}' | '$' ident ':' ident
         | '$' '(' matcher * ')' sep_token? [ '*' | '+' ]
-        | non_special_token ;
+        | non_special_token
 transcriber : '(' transcriber * ')' | '[' transcriber * ']'
             | '{' transcriber * '}' | '$' ident
             | '$' '(' transcriber * ')' sep_token? [ '*' | '+' ]
-            | non_special_token ;
+            | non_special_token
 ~~~~
 
 User-defined syntax extensions are called "macros",
@@ -803,7 +802,7 @@ use_decl : "pub" ? "use" ident [ '=' path
 
 path_glob : ident [ "::" path_glob ] ?
           | '*'
-          | '{' ident [ ',' ident ] * '}' ;
+          | '{' ident [ ',' ident ] * '}'
 ~~~~
 
 A _use declaration_ creates one or more local name bindings synonymous
@@ -1458,7 +1457,7 @@ impl Seq<bool> for u32 {
 ### External blocks
 
 ~~~~ {.notrust .ebnf .gram}
-extern_block_item : "extern" '{' extern_block '}' ;
+extern_block_item : "extern" '{' extern_block '} ;
 extern_block : [ foreign_fn ] * ;
 ~~~~
 
@@ -1684,7 +1683,7 @@ import public items from their destination, not private items.
 
 ~~~~ {.notrust .ebnf .gram}
 attribute : '#' '[' attr_list ']' ;
-attr_list : attr [ ',' attr_list ]* ;
+attr_list : attr [ ',' attr_list ]*
 attr : ident [ '=' literal
              | '(' attr_list ')' ] ? ;
 ~~~~
@@ -2332,7 +2331,7 @@ struct_expr : expr_path '{' ident ':' expr
                       [ ".." expr ] '}' |
               expr_path '(' expr
                       [ ',' expr ] * ')' |
-              expr_path ;
+              expr_path
 ~~~~
 
 There are several forms of structure expressions.
@@ -2383,7 +2382,7 @@ Point3d {y: 0, z: 10, .. base};
 ~~~~ {.notrust .ebnf .gram}
 block_expr : '{' [ view_item ] *
                  [ stmt ';' | item ] *
-                 [ expr ] '}' ;
+                 [ expr ] '}'
 ~~~~
 
 A _block expression_ is similar to a module in terms of the declarations that
@@ -2410,7 +2409,7 @@ or dynamically dispatching if the left-hand-side expression is an indirect [obje
 ### Field expressions
 
 ~~~~ {.notrust .ebnf .gram}
-field_expr : expr '.' ident ;
+field_expr : expr '.' ident
 ~~~~
 
 A _field expression_ consists of an expression followed by a single dot and an identifier,
@@ -2432,9 +2431,9 @@ it is automatically dereferenced to make the field access possible.
 ### Vector expressions
 
 ~~~~ {.notrust .ebnf .gram}
-vec_expr : '[' "mut" ? vec_elems? ']' ;
+vec_expr : '[' "mut" ? vec_elems? ']'
 
-vec_elems : [expr [',' expr]*] | [expr ',' ".." expr] ;
+vec_elems : [expr [',' expr]*] | [expr ',' ".." expr]
 ~~~~
 
 A [_vector_](#vector-types) _expression_ is written by enclosing zero or
@@ -2454,7 +2453,7 @@ as a [literal](#literals) or a [static item](#static-items).
 ### Index expressions
 
 ~~~~ {.notrust .ebnf .gram}
-idx_expr : expr '[' expr ']' ;
+idx_expr : expr '[' expr ']'
 ~~~~
 
 [Vector](#vector-types)-typed expressions can be indexed by writing a
@@ -2876,7 +2875,7 @@ then any `else` block is executed.
 ~~~~ {.notrust .ebnf .gram}
 match_expr : "match" expr '{' match_arm [ '|' match_arm ] * '}' ;
 
-match_arm : match_pat "=>" [ expr "," | '{' block '}' ] ;
+match_arm : match_pat '=>' [ expr "," | '{' block '}' ] ;
 
 match_pat : pat [ ".." pat ] ? [ "if" expr ] ;
 ~~~~

branches/try/src/etc/install.sh

@@ -189,16 +189,6 @@ validate_opt () {
     done
 }
 
-absolutify() {
-    FILE_PATH="${1}"
-    FILE_PATH_DIRNAME="$(dirname ${FILE_PATH})"
-    FILE_PATH_BASENAME="$(basename ${FILE_PATH})"
-    FILE_ABS_PATH="$(cd ${FILE_PATH_DIRNAME} && pwd)"
-    FILE_PATH="${FILE_ABS_PATH}/${FILE_PATH_BASENAME}"
-    # This is the return value
-    ABSOLUTIFIED="${FILE_PATH}"
-}
-
 CFG_SRC_DIR="$(cd $(dirname $0) && pwd)/"
 CFG_SELF="$0"
 CFG_ARGS="$@"
@@ -222,7 +212,6 @@ BOOL_OPTIONS=""
 VAL_OPTIONS=""
 
 flag uninstall "only uninstall from the installation prefix"
-opt verify 1 "verify that the installed binaries run correctly"
 valopt prefix "/usr/local" "set installation prefix"
 # NB This isn't quite the same definition as in `configure`.
 # just using 'lib' instead of CFG_LIBDIR_RELATIVE
@@ -241,50 +230,28 @@ validate_opt
 
 # OK, let's get installing ...
 
-# Sanity check: can we run the binaries?
-if [ -z "${CFG_DISABLE_VERIFY}" ]
-then
-    # Don't do this if uninstalling. Failure here won't help in any way.
-    if [ -z "${CFG_UNINSTALL}" ]
-    then
-        msg "verifying platform can run binaries"
-        "${CFG_SRC_DIR}/bin/rustc" --version > /dev/null
-        if [ $? -ne 0 ]
-        then
-            err "can't execute rustc binary on this platform"
-        fi
-    fi
-fi
-
 # Sanity check: can we can write to the destination?
-msg "verifying destination is writable"
 umask 022 && mkdir -p "${CFG_LIBDIR}"
-need_ok "can't write to destination. consider \`sudo\`."
-touch "${CFG_LIBDIR}/rust-install-probe" > /dev/null
+need_ok "can't write to destination. consider 'sudo'."
+touch "${CFG_LIBDIR}/rust-install-probe" 2> /dev/null
 if [ $? -ne 0 ]
 then
-    err "can't write to destination. consider \`sudo\`."
+    err "can't write to destination. consider 'sudo'."
 fi
-rm -f "${CFG_LIBDIR}/rust-install-probe"
+rm "${CFG_LIBDIR}/rust-install-probe"
 need_ok "failed to remove install probe"
 
 # Sanity check: don't install to the directory containing the installer.
 # That would surely cause chaos.
-msg "verifying destination is not the same as source"
 INSTALLER_DIR="$(cd $(dirname $0) && pwd)"
 PREFIX_DIR="$(cd ${CFG_PREFIX} && pwd)"
 if [ "${INSTALLER_DIR}" = "${PREFIX_DIR}" ]
 then
     err "can't install to same directory as installer"
 fi
 
-# Using an absolute path to libdir in a few places so that the status
-# messages are consistently using absolute paths.
-absolutify "${CFG_LIBDIR}"
-ABS_LIBDIR="${ABSOLUTIFIED}"
-
 # The file name of the manifest we're going to create during install
-INSTALLED_MANIFEST="${ABS_LIBDIR}/rustlib/manifest"
+INSTALLED_MANIFEST="${CFG_LIBDIR}/rustlib/manifest"
 
 # First, uninstall from the installation prefix.
 # Errors are warnings - try to rm everything in the manifest even if some fail.
@@ -296,7 +263,7 @@ then
         msg "removing $p"
         if [ -f "$p" ]
         then
-            rm -f "$p"
+            rm "$p"
             if [ $? -ne 0 ]
             then
                 warn "failed to remove $p"
@@ -306,16 +273,8 @@ then
         fi
     done < "${INSTALLED_MANIFEST}"
 
-    # If we fail to remove rustlib below, then the installed manifest will
-    # still be full; the installed manifest needs to be empty before install.
-    msg "removing ${INSTALLED_MANIFEST}"
-    rm -f "${INSTALLED_MANIFEST}"
-    # For the above reason, this is a hard error
-    need_ok "failed to remove installed manifest"
-
     # Remove 'rustlib' directory
-    msg "removing ${ABS_LIBDIR}/rustlib"
-    rm -Rf "${ABS_LIBDIR}/rustlib"
+    rm -r "${CFG_LIBDIR}/rustlib"
     if [ $? -ne 0 ]
     then
         warn "failed to remove rustlib"
@@ -339,9 +298,7 @@ fi
 
 # Create the installed manifest, which we will fill in with absolute file paths
 mkdir -p "${CFG_LIBDIR}/rustlib"
-need_ok "failed to create rustlib"
 touch "${INSTALLED_MANIFEST}"
-need_ok "failed to create installed manifest"
 
 # Now install, iterate through the new manifest and copy files
 while read p; do
@@ -367,8 +324,10 @@ while read p; do
 
     # Make the path absolute so we can uninstall it later without
     # starting from the installation cwd
-    absolutify "${FILE_INSTALL_PATH}"
-    FILE_INSTALL_PATH="${ABSOLUTIFIED}"
+    FILE_INSTALL_PATH_DIRNAME="$(dirname ${FILE_INSTALL_PATH})"
+    FILE_INSTALL_PATH_BASENAME="$(basename ${FILE_INSTALL_PATH})"
+    FILE_INSTALL_ABS_PATH="$(cd ${FILE_INSTALL_PATH_DIRNAME} && pwd)"
+    FILE_INSTALL_PATH="${FILE_INSTALL_ABS_PATH}/${FILE_INSTALL_PATH_BASENAME}"
 
     # Install the file
     msg "${FILE_INSTALL_PATH}"
@@ -387,22 +346,6 @@ while read p; do
 # The manifest lists all files to install
 done < "${CFG_SRC_DIR}/lib/rustlib/manifest.in"
 
-# Sanity check: can we run the installed binaries?
-if [ -z "${CFG_DISABLE_VERIFY}" ]
-then
-    msg "verifying installed binaries are executable"
-    "${CFG_PREFIX}/bin/rustc" --version > /dev/null
-    if [ $? -ne 0 ]
-    then
-        ERR="can't execute installed rustc binary. "
-        ERR="${ERR}installation may be broken. "
-        ERR="${ERR}if this is expected then rerun install.sh with \`--disable-verify\` "
-        ERR="${ERR}or \`make install\` with \`--disable-verify-install\`"
-        err "${ERR}"
-    fi
-fi
-
-
 echo
 echo "    Rust is ready to roll."
 echo

branches/try/src/etc/pkg/Distribution.xml

@@ -14,9 +14,13 @@
             <line choice="org.rust-lang.rust"/>
         </line>
     </choices-outline>
-    <choice id="default"/>
+    <choice id="default"
+            customLocation="usr/local"/>
     <choice id="org.rust-lang.rust" visible="false">
         <pkg-ref id="org.rust-lang.rust"/>
     </choice>
     <pkg-ref id="org.rust-lang.rust" version="0" onConclusion="none">rust.pkg</pkg-ref>
+    <welcome file="welcome.rtf" mime-type="text/enriched"/>
+    <background file="rust-logo.png" mime-type="image/png"
+                alignment="bottomleft"/>
 </installer-gui-script>