---

yaml
---
r: 108767
b: refs/heads/dist-snap
c: bc35eb7
h: refs/heads/master
i:
  108765: bd255c0
  108763: 35d1c45
  108759: 68a3873
  108751: 4956337
  108735: af4a0f9
v: v3

Author: lilyball

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: f64fdf524a434f0e5cd0bc91d09c144723f3c90d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 999d55d5f6e229b8c1118ac35c8cbf3b9c59e3a1
+refs/heads/dist-snap: bc35eb78e2dab6b7cb3ede9176b0cfcafc4f8362
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/.gitignore

@@ -60,7 +60,7 @@ config.mk
 /rt/
 /rustllvm/
 /test/
-/build
+/build/
 /inst/
 /mingw-build/
 src/.DS_Store

branches/dist-snap/.travis.yml

@@ -7,7 +7,6 @@ Adrien Tétar <[email protected]>
 Alan Andrade <[email protected]>
 Aleksander Balicki <[email protected]>
 Alex Crichton <[email protected]>
-Alex Lyon <[email protected]>
 Alex Rønne Petersen <[email protected]>
 Alexander Stavonin <[email protected]>
 Alexandros Tasos <[email protected]>

branches/dist-snap/AUTHORS.txt

@@ -19,17 +19,13 @@
 #
 # First, start with one of these build targets:
 #
-#   * all - The default. Build a complete, bootstrapped compiler.
+#   * all - The default. Builds a complete, bootstrapped compiler.
 #           `rustc` will be in `${target-triple}/stage2/bin/`. Run it
 #           directly from the build directory if you like. This also
 #           comes with docs in `doc/`.
 #
 #   * check - Run the complete test suite
 #
-#   * clean - Clean the build repertory. It is advised to run this
-#             command if you want to build Rust again, after an update
-#             of the git repository.
-#
 #   * install - Install Rust. Note that installation is not necessary
 #               to use the compiler.
 #
@@ -107,7 +103,7 @@
 #
 # </tips>
 #
-# <nitty-gritty>
+# <nittygritty>
 #
 # # The Rust Build System
 #
@@ -156,12 +152,12 @@
 # libraries are managed and versioned without polluting the common
 # areas of the filesystem.
 #
-# General rust binaries may still live in the host bin directory; they
+# General rust binaries may stil live in the host bin directory; they
 # will just link against the libraries in the target lib directory.
 #
 # Admittedly this is a little convoluted.
 #
-# </nitty-gritty>
+# </nittygritty>
 #
 
 ######################################################################
@@ -202,6 +198,16 @@ include $(CFG_SRC_DIR)mk/llvm.mk
 # Secondary makefiles, conditionalized for speed
 ######################################################################
 
+# Source and binary distribution artifacts
+ifneq ($(strip $(findstring dist,$(MAKECMDGOALS))   \
+               $(findstring check,$(MAKECMDGOALS))  \
+               $(findstring test,$(MAKECMDGOALS))   \
+               $(findstring tidy,$(MAKECMDGOALS))   \
+               $(findstring clean,$(MAKECMDGOALS))),)
+  CFG_INFO := $(info cfg: including dist rules)
+  include $(CFG_SRC_DIR)mk/dist.mk
+endif
+
 # Binary snapshots
 ifneq ($(strip $(findstring snap,$(MAKECMDGOALS))   \
                $(findstring clean,$(MAKECMDGOALS))),)
@@ -224,33 +230,18 @@ ifneq ($(findstring perf,$(MAKECMDGOALS)),)
   include $(CFG_SRC_DIR)mk/perf.mk
 endif
 
-# Copy all the distributables to another directory for binary install
-ifneq ($(strip $(findstring prepare,$(MAKECMDGOALS)) \
-               $(findstring dist,$(MAKECMDGOALS)) \
-               $(findstring install,$(MAKECMDGOALS))),)
-  CFG_INFO := $(info cfg: including prepare rules)
-  include $(CFG_SRC_DIR)mk/prepare.mk
+# Cleaning
+ifneq ($(findstring clean,$(MAKECMDGOALS)),)
+  CFG_INFO := $(info cfg: including clean rules)
+  include $(CFG_SRC_DIR)mk/clean.mk
 endif
 
-# (Unix) Installation from the build directory
+# Installation from the build directory
 ifneq ($(findstring install,$(MAKECMDGOALS)),)
   CFG_INFO := $(info cfg: including install rules)
   include $(CFG_SRC_DIR)mk/install.mk
 endif
 
-# Source and binary distribution artifacts
-ifneq ($(strip $(findstring dist,$(MAKECMDGOALS)) \
-               $(findstring clean,$(MAKECMDGOALS))),)
-  CFG_INFO := $(info cfg: including dist rules)
-  include $(CFG_SRC_DIR)mk/dist.mk
-endif
-
-# Cleaning
-ifneq ($(findstring clean,$(MAKECMDGOALS)),)
-  CFG_INFO := $(info cfg: including clean rules)
-  include $(CFG_SRC_DIR)mk/clean.mk
-endif
-
 # CTAGS building
 ifneq ($(strip $(findstring TAGS.emacs,$(MAKECMDGOALS)) \
                $(findstring TAGS.vi,$(MAKECMDGOALS))),)

branches/dist-snap/Makefile.in

@@ -604,7 +604,7 @@ then
     LLVM_VERSION=$($LLVM_CONFIG --version)
 
     case $LLVM_VERSION in
-        (3.[2-5]svn|3.[2-5])
+        (3.[2-4]svn|3.[2-4])
             msg "found ok version of LLVM: $LLVM_VERSION"
             ;;
         (*)
@@ -626,7 +626,7 @@ then
                       | cut -d ' ' -f 2)
 
     case $CFG_CLANG_VERSION in
-        (3.0svn | 3.0 | 3.1* | 3.2* | 3.3* | 3.4* | 3.5* )
+        (3.0svn | 3.0 | 3.1* | 3.2* | 3.3* | 3.4* )
         step_msg "found ok version of CLANG: $CFG_CLANG_VERSION"
         CFG_C_COMPILER="clang"
         ;;
@@ -803,6 +803,7 @@ do
     make_dir $h/test/doc-guide-pointers
     make_dir $h/test/doc-guide-container
     make_dir $h/test/doc-guide-tasks
+    make_dir $h/test/doc-guide-conditions
     make_dir $h/test/doc-complement-cheatsheet
     make_dir $h/test/doc-rust
 done

branches/dist-snap/configure

@@ -58,7 +58,6 @@ clean-generic-$(2)-$(1):
          -name '*.[odasS]' -o \
          -name '*.so' -o      \
          -name '*.dylib' -o   \
-         -name '*.rlib' -o   \
          -name 'stamp.*' -o   \
          -name '*.lib' -o     \
          -name '*.dll' -o     \

branches/dist-snap/mk/clean.mk

@@ -50,39 +50,36 @@
 ################################################################################
 
 TARGET_CRATES := std extra green rustuv native flate arena glob term semver \
-                 uuid serialize sync getopts collections num test time
+                 uuid serialize sync getopts collections num
 HOST_CRATES := syntax rustc rustdoc fourcc
 CRATES := $(TARGET_CRATES) $(HOST_CRATES)
 TOOLS := compiletest rustdoc rustc
 
 DEPS_std := native:rustrt native:compiler-rt
-DEPS_extra := std term sync serialize getopts collections time
+DEPS_extra := std term sync serialize getopts collections
 DEPS_green := std native:context_switch
 DEPS_rustuv := std native:uv native:uv_support
 DEPS_native := std
 DEPS_syntax := std term serialize collections
 DEPS_rustc := syntax native:rustllvm flate arena serialize sync getopts \
-              collections time extra
-DEPS_rustdoc := rustc native:sundown serialize sync getopts collections \
-                test time
-DEPS_flate := std extra native:miniz
+              collections extra
+DEPS_rustdoc := rustc native:sundown serialize sync getopts collections
+DEPS_flate := std native:miniz
 DEPS_arena := std collections
 DEPS_glob := std
-DEPS_serialize := std collections
-DEPS_term := std collections
+DEPS_serialize := std
+DEPS_term := std
 DEPS_semver := std
 DEPS_uuid := std serialize
 DEPS_sync := std
 DEPS_getopts := std
-DEPS_collections := std
+DEPS_collections := std serialize
 DEPS_fourcc := syntax std
-DEPS_num := std
-DEPS_test := std extra collections getopts serialize term
-DEPS_time := std serialize
+DEPS_num := std extra
 
-TOOL_DEPS_compiletest := test green rustuv getopts
-TOOL_DEPS_rustdoc := rustdoc native
-TOOL_DEPS_rustc := rustc native
+TOOL_DEPS_compiletest := extra green rustuv getopts
+TOOL_DEPS_rustdoc := rustdoc green rustuv
+TOOL_DEPS_rustc := rustc green rustuv
 TOOL_SOURCE_compiletest := $(S)src/compiletest/compiletest.rs
 TOOL_SOURCE_rustdoc := $(S)src/driver/driver.rs
 TOOL_SOURCE_rustc := $(S)src/driver/driver.rs

branches/dist-snap/mk/crates.mk

@@ -12,10 +12,6 @@ PKG_ICO = $(S)src/etc/pkg/rust-logo.ico
 PKG_EXE = $(PKG_DIR)-install.exe
 endif
 
-ifeq ($(CFG_OSTYPE), apple-darwin)
-PKG_OSX = $(PKG_DIR).pkg
-endif
-
 PKG_GITMODULES := $(S)src/libuv $(S)src/llvm $(S)src/gyp $(S)src/compiler-rt
 
 PKG_FILES := \
@@ -28,10 +24,10 @@ PKG_FILES := \
     $(S)RELEASES.txt                           \
     $(S)configure $(S)Makefile.in              \
     $(S)man                                    \
+    $(S)doc                                    \
     $(addprefix $(S)src/,                      \
       README.md                                \
       compiletest                              \
-      doc                                      \
       driver                                   \
       etc                                      \
       $(foreach crate,$(CRATES),lib$(crate))   \
@@ -45,36 +41,24 @@ PKG_FILES := \
 
 UNROOTED_PKG_FILES := $(patsubst $(S)%,./%,$(PKG_FILES))
 
+ifdef CFG_ISCC
 LICENSE.txt: $(S)COPYRIGHT $(S)LICENSE-APACHE $(S)LICENSE-MIT
 	cat $^ > $@
 
-ifdef CFG_ISCC
 %.iss: $(S)src/etc/pkg/%.iss
 	cp $< $@
 
 %.ico: $(S)src/etc/pkg/%.ico
 	cp $< $@
 
 $(PKG_EXE): rust.iss modpath.iss LICENSE.txt rust-logo.ico \
-            $(PKG_FILES) $(CSREQ3_T_$(CFG_BUILD)_H_$(CFG_BUILD)) \
-            dist-prepare-win
-	$(CFG_PYTHON) $(S)src/etc/copy-runtime-deps.py tmp/dist/win/bin
+            $(PKG_FILES) $(CSREQ3_T_$(CFG_BUILD)_H_$(CFG_BUILD))
+	$(CFG_PYTHON) $(S)src/etc/copy-runtime-deps.py i686-pc-mingw32/stage3/bin
 	@$(call E, ISCC: $@)
 	$(Q)"$(CFG_ISCC)" $<
-
-dist-prepare-win: PREPARE_HOST=$(CFG_BUILD)
-dist-prepare-win: PREPARE_TARGETS=$(CFG_BUILD)
-dist-prepare-win: PREPARE_DEST_DIR=tmp/dist/win
-# On windows we're using stage3, unlike Unix...
-dist-prepare-win: PREPARE_STAGE=3
-dist-prepare-win: PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD)
-dist-prepare-win: PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD)
-dist-prepare-win: PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD)
-dist-prepare-win: PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD)
-dist-prepare-win: prepare-base
-
 endif
 
+
 $(PKG_TAR): $(PKG_FILES)
 	@$(call E, making dist dir)
 	$(Q)rm -Rf dist
@@ -107,7 +91,7 @@ distcheck: dist
 
 else
 
-dist: $(PKG_TAR) $(PKG_OSX)
+dist: $(PKG_TAR)
 
 distcheck: $(PKG_TAR)
 	$(Q)rm -Rf dist
@@ -128,31 +112,3 @@ distcheck: $(PKG_TAR)
 	@echo -----------------------------------------------
 
 endif
-
-ifeq ($(CFG_OSTYPE), apple-darwin)
-
-dist-prepare-osx: PREPARE_HOST=$(CFG_BUILD)
-dist-prepare-osx: PREPARE_TARGETS=$(CFG_BUILD)
-dist-prepare-osx: PREPARE_DEST_DIR=tmp/dist/pkgroot
-dist-prepare-osx: PREPARE_STAGE=2
-dist-prepare-osx: PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD)
-dist-prepare-osx: PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD)
-dist-prepare-osx: PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD)
-dist-prepare-osx: PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD)
-dist-prepare-osx: prepare-base
-
-$(PKG_OSX): Distribution.xml LICENSE.txt dist-prepare-osx
-	@$(call E, making OS X pkg)
-	$(Q)pkgbuild --identifier org.rust-lang.rust --root tmp/dist/pkgroot rust.pkg
-	$(Q)productbuild --distribution Distribution.xml --resources . $(PKG_OSX)
-	$(Q)rm -rf tmp rust.pkg
-
-dist-osx: $(PKG_OSX)
-
-distcheck-osx: $(PKG_OSX)
-	@echo
-	@echo -----------------------------------------------
-	@echo $(PKG_OSX) ready for distribution
-	@echo -----------------------------------------------
-
-endif