---

yaml
---
r: 275670
b: refs/heads/master
c: c99b73a
h: refs/heads/master

Author: nrc

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 887e9471783ff3f5edc920a85b6110486dc063c0
+refs/heads/master: c99b73a767a38d5b97214b7dbf6ee3c08ac782fd
 refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
 refs/heads/try: 49312a405e14a449b98fe0056b12a40ac128be4a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

trunk/Makefile.in

@@ -214,6 +214,13 @@ include $(CFG_SRC_DIR)mk/debuggers.mk
 # Secondary makefiles, conditionalized for speed
 ######################################################################
 
+# Binary snapshots
+ifneq ($(strip $(findstring snap,$(MAKECMDGOALS))   \
+               $(findstring clean,$(MAKECMDGOALS))),)
+  CFG_INFO := $(info cfg: including snap rules)
+  include $(CFG_SRC_DIR)mk/snap.mk
+endif
+
 # The test suite
 ifneq ($(strip $(findstring check,$(MAKECMDGOALS)) \
                $(findstring test,$(MAKECMDGOALS))  \

trunk/mk/crates.mk

@@ -97,7 +97,7 @@ DEPS_rustc_const_eval := rustc_const_math rustc syntax log serialize \
 					     rustc_back graphviz
 
 DEPS_rustc := syntax fmt_macros flate arena serialize getopts rbml \
-              log graphviz rustc_llvm rustc_back rustc_data_structures\
+              log graphviz rustc_back rustc_data_structures\
 		  	  rustc_const_math
 DEPS_rustc_back := std syntax flate log libc
 DEPS_rustc_borrowck := rustc rustc_mir log graphviz syntax

trunk/mk/dist.mk

@@ -61,7 +61,7 @@ PKG_FILES := \
       rtstartup                                \
       rustllvm                                 \
       rustc                                    \
-      stage0.txt                               \
+      snapshots.txt                            \
       rust-installer                           \
       tools                                    \
       test)                                    \

trunk/mk/main.mk

@@ -34,7 +34,6 @@ CFG_FILENAME_EXTRA=$(shell printf '%s' $(CFG_RELEASE)$(CFG_EXTRA_FILENAME) | $(C
 # intentionally not "secure" by any definition, this is largely just a deterrent
 # from users enabling unstable features on the stable compiler.
 CFG_BOOTSTRAP_KEY=$(CFG_FILENAME_EXTRA)
-CFG_BOOTSTRAP_KEY_STAGE0=$(shell grep 'rustc_key' $(S)src/stage0.txt | sed 's/rustc_key: '//)
 
 ifeq ($(CFG_RELEASE_CHANNEL),stable)
 # This is the normal semver version string, e.g. "0.12.0", "0.12.0-nightly"

trunk/mk/reconfig.mk

@@ -38,6 +38,6 @@ else
 SREL_ROOT := $(SREL)
 endif
 
-config.stamp: $(S)configure $(S)Makefile.in $(S)src/stage0.txt
+config.stamp: $(S)configure $(S)Makefile.in $(S)src/snapshots.txt
 	@$(call E, cfg: reconfiguring)
 	$(SREL_ROOT)configure $(CFG_CONFIGURE_ARGS)

trunk/mk/rustllvm.mk

@@ -43,9 +43,6 @@ $$(RT_OUTPUT_DIR_$(1))/$$(call CFG_STATIC_LIB_NAME_$(1),rustllvm): \
 	@$$(call E, link: $$@)
 	$$(Q)$$(call CFG_CREATE_ARCHIVE_$(1),$$@) $$^
 
-RUSTLLVM_COMPONENTS_$(1) = $$(shell echo $$(LLVM_ALL_COMPONENTS_$(1)) |\
-	tr 'a-z-' 'A-Z_'| sed -e 's/^ //;s/\([^ ]*\)/\-DLLVM_COMPONENT_\1/g')
-
 # On MSVC we need to double-escape arguments that llvm-config printed which
 # start with a '/'. The shell we're running in will auto-translate the argument
 # `/foo` to `C:/msys64/foo` but we really want it to be passed through as `/foo`
@@ -54,7 +51,6 @@ $(1)/rustllvm/%.o: $(S)src/rustllvm/%.cpp $$(MKFILE_DEPS) $$(LLVM_CONFIG_$(1))
 	@$$(call E, compile: $$@)
 	$$(Q)$$(call CFG_COMPILE_CXX_$(1), $$@,) \
 		$$(subst  /,//,$$(LLVM_CXXFLAGS_$(1))) \
-		$$(RUSTLLVM_COMPONENTS_$(1)) \
 		$$(EXTRA_RUSTLLVM_CXXFLAGS_$(1)) \
 		$$(RUSTLLVM_INCS_$(1)) \
 		$$<

trunk/mk/snap.mk

@@ -0,0 +1,28 @@
+# Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution and at
+# http://rust-lang.org/COPYRIGHT.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
+
+define DEF_SNAP_FOR_STAGE_H
+# $(1) stage
+# $(2) triple
+
+snap-stage$(1)-H-$(2): $$(HSREQ$(1)_H_$(2))
+	$(CFG_PYTHON) $(S)src/etc/make-snapshot.py stage$(1) $(2)
+
+endef
+
+$(foreach host,$(CFG_HOST), \
+ $(foreach stage,1 2 3, \
+  $(eval $(call DEF_SNAP_FOR_STAGE_H,$(stage),$(host)))))
+
+snap-stage1: snap-stage1-H-$(CFG_BUILD)
+
+snap-stage2: snap-stage2-H-$(CFG_BUILD)
+
+snap-stage3: snap-stage3-H-$(CFG_BUILD)

trunk/mk/stage0.mk

@@ -10,14 +10,17 @@ $(HLIB0_H_$(CFG_BUILD))/:
 endif
 
 $(SNAPSHOT_RUSTC_POST_CLEANUP): \
-		$(S)src/stage0.txt \
-		$(S)src/etc/get-stage0.py $(MKFILE_DEPS) \
+		$(S)src/snapshots.txt \
+		$(S)src/etc/get-snapshot.py $(MKFILE_DEPS) \
 		| $(HBIN0_H_$(CFG_BUILD))/
+
 	@$(call E, fetch: $@)
+#   Note: the variable "SNAPSHOT_FILE" is generally not set, and so
+#   we generally only pass one argument to this script.
 ifdef CFG_ENABLE_LOCAL_RUST
 	$(Q)$(S)src/etc/local_stage0.sh $(CFG_BUILD) $(CFG_LOCAL_RUST_ROOT) rustlib
 else
-	$(Q)$(CFG_PYTHON) $(S)src/etc/get-stage0.py $(CFG_BUILD)
+	$(Q)$(CFG_PYTHON) $(S)src/etc/get-snapshot.py $(CFG_BUILD) $(SNAPSHOT_FILE)
 endif
 	$(Q)if [ -e "$@" ]; then touch "$@"; else echo "ERROR: snapshot $@ not found"; exit 1; fi
 

trunk/mk/target.mk

@@ -65,11 +65,6 @@ $(foreach host,$(CFG_HOST), \
 # $(4) is the crate name
 define RUST_TARGET_STAGE_N
 
-ifeq ($(1),0)
-$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \
-	export RUSTC_BOOTSTRAP_KEY := $$(CFG_BOOTSTRAP_KEY_STAGE0)
-endif
-
 $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): CFG_COMPILER_HOST_TRIPLE = $(2)
 $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \
 		$$(CRATEFILE_$(4)) \
@@ -118,11 +113,6 @@ endef
 # $(4) - name of the tool being built
 define TARGET_TOOL
 
-ifeq ($(1),0)
-$$(TBIN$(1)_T_$(2)_H_$(3))/$(4)$$(X_$(2)): \
-	export RUSTC_BOOTSTRAP_KEY := $$(CFG_BOOTSTRAP_KEY_STAGE0)
-endif
-
 $$(TBIN$(1)_T_$(2)_H_$(3))/$(4)$$(X_$(2)): \
 		$$(TOOL_SOURCE_$(4)) \
 		$$(TOOL_INPUTS_$(4)) \
@@ -177,15 +167,11 @@ SNAPSHOT_RUSTC_POST_CLEANUP=$(HBIN0_H_$(CFG_BUILD))/rustc$(X_$(CFG_BUILD))
 
 define TARGET_HOST_RULES
 
-$$(TLIB$(1)_T_$(2)_H_$(3))/: $$(SNAPSHOT_RUSTC_POST_CLEANUP)
-	mkdir -p $$@
-
-$$(TBIN$(1)_T_$(2)_H_$(3))/: $$(SNAPSHOT_RUSTC_POST_CLEANUP)
+$$(TLIB$(1)_T_$(2)_H_$(3))/:
 	mkdir -p $$@
 
 $$(TLIB$(1)_T_$(2)_H_$(3))/%: $$(RT_OUTPUT_DIR_$(2))/% \
-	    $$(SNAPSHOT_RUSTC_POST_CLEANUP) \
-	    | $$(TLIB$(1)_T_$(2)_H_$(3))/
+	    | $$(TLIB$(1)_T_$(2)_H_$(3))/ $$(SNAPSHOT_RUSTC_POST_CLEANUP)
 	@$$(call E, cp: $$@)
 	$$(Q)cp $$< $$@
 endef

trunk/mk/tests.mk

@@ -241,16 +241,13 @@ cleantestlibs:
 ######################################################################
 
 .PHONY: tidy
-tidy: $(HBIN0_H_$(CFG_BUILD))/tidy$(X_$(CFG_BUILD)) \
-		$(SNAPSHOT_RUSTC_POST_CLEANUP)
+tidy: $(HBIN0_H_$(CFG_BUILD))/tidy$(X_$(CFG_BUILD))
 	$(TARGET_RPATH_VAR0_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $< $(S)src
 
 $(HBIN0_H_$(CFG_BUILD))/tidy$(X_$(CFG_BUILD)): \
 		$(TSREQ0_T_$(CFG_BUILD)_H_$(CFG_BUILD)) \
 		$(TLIB0_T_$(CFG_BUILD)_H_$(CFG_BUILD))/stamp.std \
-		$(call rwildcard,$(S)src/tools/tidy/src,*.rs) \
-		$(SNAPSHOT_RUSTC_POST_CLEANUP) | \
-		$(TLIB0_T_$(CFG_BUILD)_H_$(CFG_BUILD))
+		$(call rwildcard,$(S)src/tools/tidy/src,*.rs)
 	$(STAGE0_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $(S)src/tools/tidy/src/main.rs \
 		--out-dir $(@D) --crate-name tidy
 

trunk/src/bootstrap/bootstrap.py

@@ -79,22 +79,11 @@ def run(args, verbose=False):
             raise RuntimeError(err)
         sys.exit(err)
 
-def stage0_data(rust_root):
-    nightlies = os.path.join(rust_root, "src/stage0.txt")
-    with open(nightlies, 'r') as nightlies:
-        data = {}
-        for line in nightlies.read().split("\n"):
-            if line.startswith("#") or line == '':
-                continue
-            a, b = line.split(": ", 1)
-            data[a] = b
-        return data
-
 class RustBuild:
-    def download_stage0(self):
+    def download_rust_nightly(self):
         cache_dst = os.path.join(self.build_dir, "cache")
-        rustc_cache = os.path.join(cache_dst, self.stage0_rustc_date())
-        cargo_cache = os.path.join(cache_dst, self.stage0_cargo_date())
+        rustc_cache = os.path.join(cache_dst, self.snap_rustc_date())
+        cargo_cache = os.path.join(cache_dst, self.snap_cargo_date())
         if not os.path.exists(rustc_cache):
             os.makedirs(rustc_cache)
         if not os.path.exists(cargo_cache):
@@ -104,49 +93,41 @@ def download_stage0(self):
            (not os.path.exists(self.rustc()) or self.rustc_out_of_date()):
             if os.path.exists(self.bin_root()):
                 shutil.rmtree(self.bin_root())
-            channel = self.stage0_rustc_channel()
-            filename = "rust-std-" + channel + "-" + self.build + ".tar.gz"
-            url = "https://static.rust-lang.org/dist/" + self.stage0_rustc_date()
+            filename = "rust-std-nightly-" + self.build + ".tar.gz"
+            url = "https://static.rust-lang.org/dist/" + self.snap_rustc_date()
             tarball = os.path.join(rustc_cache, filename)
             if not os.path.exists(tarball):
                 get(url + "/" + filename, tarball, verbose=self.verbose)
             unpack(tarball, self.bin_root(),
                    match="rust-std-" + self.build,
                    verbose=self.verbose)
 
-            filename = "rustc-" + channel + "-" + self.build + ".tar.gz"
-            url = "https://static.rust-lang.org/dist/" + self.stage0_rustc_date()
+            filename = "rustc-nightly-" + self.build + ".tar.gz"
+            url = "https://static.rust-lang.org/dist/" + self.snap_rustc_date()
             tarball = os.path.join(rustc_cache, filename)
             if not os.path.exists(tarball):
                 get(url + "/" + filename, tarball, verbose=self.verbose)
             unpack(tarball, self.bin_root(), match="rustc", verbose=self.verbose)
             with open(self.rustc_stamp(), 'w') as f:
-                f.write(self.stage0_rustc_date())
+                f.write(self.snap_rustc_date())
 
         if self.cargo().startswith(self.bin_root()) and \
            (not os.path.exists(self.cargo()) or self.cargo_out_of_date()):
-            channel = self.stage0_cargo_channel()
-            filename = "cargo-" + channel + "-" + self.build + ".tar.gz"
-            url = "https://static.rust-lang.org/cargo-dist/" + self.stage0_cargo_date()
+            filename = "cargo-nightly-" + self.build + ".tar.gz"
+            url = "https://static.rust-lang.org/cargo-dist/" + self.snap_cargo_date()
             tarball = os.path.join(cargo_cache, filename)
             if not os.path.exists(tarball):
                 get(url + "/" + filename, tarball, verbose=self.verbose)
             unpack(tarball, self.bin_root(), match="cargo", verbose=self.verbose)
             with open(self.cargo_stamp(), 'w') as f:
-                f.write(self.stage0_cargo_date())
+                f.write(self.snap_cargo_date())
 
-    def stage0_cargo_date(self):
+    def snap_cargo_date(self):
         return self._cargo_date
 
-    def stage0_cargo_channel(self):
-        return self._cargo_channel
-
-    def stage0_rustc_date(self):
+    def snap_rustc_date(self):
         return self._rustc_date
 
-    def stage0_rustc_channel(self):
-        return self._rustc_channel
-
     def rustc_stamp(self):
         return os.path.join(self.bin_root(), '.rustc-stamp')
 
@@ -157,13 +138,13 @@ def rustc_out_of_date(self):
         if not os.path.exists(self.rustc_stamp()):
             return True
         with open(self.rustc_stamp(), 'r') as f:
-            return self.stage0_rustc_date() != f.read()
+            return self.snap_rustc_date() != f.read()
 
     def cargo_out_of_date(self):
         if not os.path.exists(self.cargo_stamp()):
             return True
         with open(self.cargo_stamp(), 'r') as f:
-            return self.stage0_cargo_date() != f.read()
+            return self.snap_cargo_date() != f.read()
 
     def bin_root(self):
         return os.path.join(self.build_dir, self.build, "stage0")
@@ -206,6 +187,15 @@ def exe_suffix(self):
         else:
             return ''
 
+    def parse_nightly_dates(self):
+        nightlies = os.path.join(self.rust_root, "src/nightlies.txt")
+        with open(nightlies, 'r') as nightlies:
+            rustc, cargo = nightlies.read().split("\n")[:2]
+            assert rustc.startswith("rustc: ")
+            assert cargo.startswith("cargo: ")
+            self._rustc_date = rustc[len("rustc: "):]
+            self._cargo_date = cargo[len("cargo: "):]
+
     def build_bootstrap(self):
         env = os.environ.copy()
         env["CARGO_TARGET_DIR"] = os.path.join(self.build_dir, "bootstrap")
@@ -310,53 +300,46 @@ def build_triple(self):
 
         return cputype + '-' + ostype
 
-def main():
-    parser = argparse.ArgumentParser(description='Build rust')
-    parser.add_argument('--config')
-    parser.add_argument('-v', '--verbose', action='store_true')
-
-    args = [a for a in sys.argv if a != '-h']
-    args, _ = parser.parse_known_args(args)
-
-    # Configure initial bootstrap
-    rb = RustBuild()
-    rb.config_toml = ''
-    rb.config_mk = ''
-    rb.rust_root = os.path.abspath(os.path.join(__file__, '../../..'))
-    rb.build_dir = os.path.join(os.getcwd(), "build")
-    rb.verbose = args.verbose
-
-    try:
-        with open(args.config or 'config.toml') as config:
-            rb.config_toml = config.read()
-    except:
-        pass
-    try:
-        rb.config_mk = open('config.mk').read()
-    except:
-        pass
-
-    data = stage0_data(rb.rust_root)
-    rb._rustc_channel, rb._rustc_date = data['rustc'].split('-', 1)
-    rb._cargo_channel, rb._cargo_date = data['cargo'].split('-', 1)
-
-    # Fetch/build the bootstrap
-    rb.build = rb.build_triple()
-    rb.download_stage0()
-    sys.stdout.flush()
-    rb.build_bootstrap()
-    sys.stdout.flush()
-
-    # Run the bootstrap
-    args = [os.path.join(rb.build_dir, "bootstrap/debug/bootstrap")]
-    args.append('--src')
-    args.append(rb.rust_root)
-    args.append('--build')
-    args.append(rb.build)
-    args.extend(sys.argv[1:])
-    env = os.environ.copy()
-    env["BOOTSTRAP_PARENT_ID"] = str(os.getpid())
-    rb.run(args, env)
-
-if __name__ == '__main__':
-    main()
+parser = argparse.ArgumentParser(description='Build rust')
+parser.add_argument('--config')
+parser.add_argument('-v', '--verbose', action='store_true')
+
+args = [a for a in sys.argv if a != '-h']
+args, _ = parser.parse_known_args(args)
+
+# Configure initial bootstrap
+rb = RustBuild()
+rb.config_toml = ''
+rb.config_mk = ''
+rb.rust_root = os.path.abspath(os.path.join(__file__, '../../..'))
+rb.build_dir = os.path.join(os.getcwd(), "build")
+rb.verbose = args.verbose
+
+try:
+    with open(args.config or 'config.toml') as config:
+        rb.config_toml = config.read()
+except:
+    pass
+try:
+    rb.config_mk = open('config.mk').read()
+except:
+    pass
+
+# Fetch/build the bootstrap
+rb.build = rb.build_triple()
+rb.parse_nightly_dates()
+rb.download_rust_nightly()
+sys.stdout.flush()
+rb.build_bootstrap()
+sys.stdout.flush()
+
+# Run the bootstrap
+args = [os.path.join(rb.build_dir, "bootstrap/debug/bootstrap")]
+args.append('--src')
+args.append(rb.rust_root)
+args.append('--build')
+args.append(rb.build)
+args.extend(sys.argv[1:])
+env = os.environ.copy()
+env["BOOTSTRAP_PARENT_ID"] = str(os.getpid())
+rb.run(args, env)