---

yaml
---
r: 68603
b: refs/heads/auto
c: fc02d69
h: refs/heads/master
i:
  68601: 81cadde
  68599: c6b6fea
v: v3

Author: bors

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: b60cf0c5b0cf36625083c2624df9fb35d0af3578
+refs/heads/auto: fc02d69e9616c2aa119c223b01a19b7d8fd8063d
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/.gitmodules

@@ -1,6 +1,8 @@
 [submodule "src/llvm"]
 	path = src/llvm
 	url = https://github.com/brson/llvm.git
+	branch = master
 [submodule "src/libuv"]
 	path = src/libuv
 	url = https://github.com/brson/libuv.git
+	branch = master

branches/auto/AUTHORS.txt

@@ -10,9 +10,11 @@ Aleksander Balicki <[email protected]>
 Alex Crichton <[email protected]>
 Alex Rønne Petersen <[email protected]>
 Alexander Stavonin <[email protected]>
+Alexei Sholik <[email protected]>
 Andreas Gal <[email protected]>
 Andrew Dunham <[email protected]>
 Andrew Paseltiner <[email protected]>
+Anthony Juckel <[email protected]>
 Arkaitz Jimenez <[email protected]>
 Armin Ronacher <[email protected]>
 Ashok Gautham <[email protected]>
@@ -29,23 +31,32 @@ Benjamin Kircher <[email protected]>
 Benjamin Peterson <[email protected]>
 Bilal Husain <[email protected]>
 Bill Fallon <[email protected]>
+Bill Myers <[email protected]>
+Bill Wendling <[email protected]>
+Björn Steinbrink <[email protected]>
 Brendan Eich <[email protected]>
 Brendan Zabarauskas <[email protected]>
 Brett Cannon <[email protected]>
 Brian Anderson <[email protected]>
 Brian J. Burg <[email protected]>
 Brian Leibig <[email protected]>
+Bryan Dunsmore <[email protected]>
+Caitlin Potter <[email protected]>
 Chris Double <[email protected]>
 Chris Peterson <[email protected]>
 Chris Pressey <[email protected]>
 Cody Schroeder <[email protected]>
+Corey Richardson <[email protected]>
 Damian Gryski <[email protected]>
 Damien Grassart <[email protected]>
 Damien Schoof <[email protected]>
 Daniel Brooks <[email protected]>
+Daniel Farina <[email protected]>
+Dan Luu <[email protected]>
 Daniel Luz <[email protected]>
 Daniel Micay <[email protected]>
 Daniel Patterson <[email protected]>
+Daniel Ralston <[email protected]>
 Daniel Ursache Dogariu <[email protected]>
 Dave Herman <[email protected]>
 David Forsythe <[email protected]>
@@ -62,17 +73,21 @@ Eric Holmes <[email protected]>
 Erick Tryzelaar <[email protected]>
 Erik Rose <[email protected]>
 Evan McClanahan <[email protected]>
+Fedor Indutny <[email protected]>
 Felix S. Klock II <[email protected]>
 Francisco Souza <[email protected]>
 Franklin Chen <[email protected]>
+Gábor Horváth <[email protected]>
 Gabriel <[email protected]>
 Gareth Daniel Smith <[email protected]>
+gifnksm <[email protected]>
 Glenn Willen <[email protected]>
 Gonçalo Cabrita <[email protected]>
 Graham Fawcett <[email protected]>
 Grahame Bowland <[email protected]>
 Haitao Li <[email protected]>
 hansjorg <[email protected]>
+Herman J. Radtke III <[email protected]>
 Huon Wilson <[email protected]>
 Ian D. Bollinger <[email protected]>
 Ilyong Cho <[email protected]>
@@ -83,6 +98,7 @@ Jacob Harris Cryer Kragh <[email protected]>
 Jacob Parker <[email protected]>
 Jakub Wieczorek <[email protected]>
 James Miller <[email protected]>
+James Tranovich <[email protected]>
 Jason Orendorff <[email protected]>
 Jed Davis <[email protected]>
 Jeff Balogh <[email protected]>
@@ -92,6 +108,7 @@ Jeffrey Yasskin <[email protected]>
 Jeong YunWon <[email protected]>
 Jens Nockert <[email protected]>
 Jesse Jones <[email protected]>
+Jesse Luehrs <[email protected]>
 Jesse Ruderman <[email protected]>
 Jihyun Yu <[email protected]>
 Jim Blandy <[email protected]>
@@ -104,14 +121,18 @@ Jonathan Sternberg <[email protected]>
 Josh Matthews <[email protected]>
 Joshua Clark <[email protected]>
 Joshua Wise <[email protected]>
+Junyoung Cho <[email protected]>
 Jyun-Yan You <[email protected]>
 Kang Seonghoon <[email protected]>
 Kelly Wilson <[email protected]>
 Kevin Atkinson <[email protected]>
+Kevin Ballard <[email protected]>
 Kevin Cantu <[email protected]>
+klutzy <[email protected]>
 Kyeongwoon Lee <[email protected]>
 Laurent Bonnans <[email protected]>
 Lawrence Velázquez <[email protected]>
+Leah Hanson <[email protected]>
 Lennart Kudling <[email protected]>
 Lindsey Kuper <[email protected]>
 Luca Bruno <[email protected]>
@@ -122,6 +143,7 @@ Margaret Meyerhofer <[email protected]>
 Marijn Haverbeke <[email protected]>
 Mark Lacey <[email protected]>
 Mark Vian <[email protected]>
+Marti Raudsepp <[email protected]>
 Martin DeMello <[email protected]>
 Marvin Löbel <[email protected]>
 Matt Brubeck <[email protected]>
@@ -143,43 +165,64 @@ Patrick Walton <[email protected]>
 Patrik Kårlin <[email protected]>
 Paul Stansifer <[email protected]>
 Paul Woolcock <[email protected]>
+Pavel Panchekha <[email protected]>
 Peter Hull <[email protected]>
 Peter Williams <[email protected]>
 Philipp Brüschweiler <[email protected]>
 Rafael Ávila de Espíndola <[email protected]>
+Ralph Bodenner <[email protected]>
 Ralph Giles <[email protected]>
+Ramkumar Ramachandra <[email protected]>
 Reuben Morais <[email protected]>
 Rick Waldron <[email protected]>
 Rob Arnold <[email protected]>
+Rob Hoelz <[email protected]>
 Roland Tanglao <[email protected]>
+Ron Dahlgren <[email protected]>
 Roy Frostig <[email protected]>
 Ryan Scheel <[email protected]>
+Samuel Chase <[email protected]>
+Sander Mathijs van Veen <[email protected]>
+Sangeun Kim <[email protected]>
+Saurabh Anand <[email protected]>
+Sean Moon <[email protected]>
 Sean Stangl <[email protected]>
 Sebastian N. Fernandez <[email protected]>
 Seth Pink <[email protected]>
 Seo Sanghyeon <[email protected]>
 sevrak <[email protected]>
+SiegeLord <[email protected]>
 Simon Barber-Dueck <[email protected]>
 Simon Sapin <[email protected]>
 startling <[email protected]>
 Stefan Plantikow <[email protected]>
 Steve Klabnik <[email protected]>
+Steven De Coeyer <[email protected]>
+Steven Fackler <[email protected]>
+Steven Stewart-Gallus <[email protected]>
 Taras Shpot <[email protected]>
 Ted Horst <[email protected]>
 Thad Guidry <[email protected]>
+Thomas Daede <[email protected]>
 Tim Chevalier <[email protected]>
 Tim Taubert <[email protected]>
 Tom Lee <[email protected]>
+Tommy M. McGuire <[email protected]>
 Tomoki Aonuma <[email protected]>
 Tony Young <[email protected]>
 Trinick <[email protected]>
 Tycho Sci <[email protected]>
 Tyler Bindon <[email protected]>
+Uwe Dauernheim <[email protected]>
+Vadim Chugunov <[email protected]>
 Viktor Dahl <[email protected]>
 Vincent Belliard <[email protected]>
+Vivek Galatage <[email protected]>
 Wade Mealing <[email protected]>
 William Ting <[email protected]>
 Yasuhiro Fujii <[email protected]>
 Young-il Choi <[email protected]>
+Youngmin Yoo <[email protected]>
 Youngsoo Son <[email protected]>
 Zack Corr <[email protected]>
+zofrex <[email protected]>

branches/auto/Makefile.in

@@ -139,8 +139,11 @@ endif
 
 # version-string calculation
 CFG_GIT_DIR := $(CFG_SRC_DIR).git
-CFG_RELEASE = 0.6
+CFG_RELEASE = 0.7
 CFG_VERSION = $(CFG_RELEASE)
+# windows exe's need numeric versions - don't use anything but
+# numbers and dots here
+CFG_VERSION_WIN = 0.7
 
 ifneq ($(wildcard $(CFG_GIT)),)
 ifneq ($(wildcard $(CFG_GIT_DIR)),)
@@ -239,29 +242,29 @@ $(foreach target,$(CFG_TARGET_TRIPLES),\
 # Standard library variables
 ######################################################################
 
-STDLIB_CRATE := $(S)src/libstd/core.rc
+STDLIB_CRATE := $(S)src/libstd/std.rs
 STDLIB_INPUTS := $(wildcard $(addprefix $(S)src/libstd/,        \
-                                           core.rc *.rs */*.rs */*/*rs */*/*/*rs))
+                                           *.rs */*.rs */*/*rs */*/*/*rs))
 
 ######################################################################
 # Extra library variables
 ######################################################################
 
-EXTRALIB_CRATE := $(S)src/libextra/std.rc
+EXTRALIB_CRATE := $(S)src/libextra/extra.rs
 EXTRALIB_INPUTS := $(wildcard $(addprefix $(S)src/libextra/,          \
-                                          std.rc *.rs */*.rs))
+                                          *.rs */*.rs))
 
 ######################################################################
 # rustc crate variables
 ######################################################################
 
-COMPILER_CRATE := $(S)src/librustc/rustc.rc
+COMPILER_CRATE := $(S)src/librustc/rustc.rs
 COMPILER_INPUTS := $(wildcard $(addprefix $(S)src/librustc/,      \
-                           rustc.rc *.rs */*.rs */*/*.rs */*/*/*.rs))
+                           *.rs */*.rs */*/*.rs */*/*/*.rs))
 
-LIBSYNTAX_CRATE := $(S)src/libsyntax/syntax.rc
+LIBSYNTAX_CRATE := $(S)src/libsyntax/syntax.rs
 LIBSYNTAX_INPUTS := $(wildcard $(addprefix $(S)src/libsyntax/, \
-                            syntax.rc *.rs */*.rs */*/*.rs))
+                           *.rs */*.rs */*/*.rs))
 
 DRIVER_CRATE := $(S)src/driver/driver.rs
 
@@ -311,6 +314,7 @@ $(foreach host,$(CFG_HOST_TRIPLES), \
 export CFG_SRC_DIR
 export CFG_BUILD_DIR
 export CFG_VERSION
+export CFG_VERSION_WIN
 export CFG_BUILD_TRIPLE
 export CFG_LLVM_ROOT
 export CFG_ENABLE_MINGW_CROSS
@@ -536,10 +540,19 @@ ALL_TARGET_RULES = $(foreach target,$(CFG_TARGET_TRIPLES), \
 	$(foreach host,$(CFG_HOST_TRIPLES), \
  all-target-$(target)-host-$(host)))
 
-all: $(ALL_TARGET_RULES) $(GENERATED) docs
+all: rustllvm/llvm-auto-clean-stamp \
+     $(ALL_TARGET_RULES) $(GENERATED) docs
 
 endif
 
+# This is used to independently force an LLVM clean rebuild
+# when we changed something not otherwise captured by builtin
+# dependencies. In these cases, commit a change that touches
+# the stamp in the source dir.
+rustllvm/llvm-auto-clean-stamp: $(S)src/rustllvm/llvm-auto-clean-trigger
+	$(Q)$(MAKE) clean-llvm
+	touch $@
+
 
 ######################################################################
 # Re-configuration

branches/auto/README.md

@@ -42,9 +42,9 @@ packages:
 Assuming you're on a relatively modern *nix system and have met the
 prerequisites, something along these lines should work.
 
-    $ curl -O http://static.rust-lang.org/dist/rust-0.6.tar.gz
-    $ tar -xzf rust-0.6.tar.gz
-    $ cd rust-0.6
+    $ curl -O http://static.rust-lang.org/dist/rust-0.7.tar.gz
+    $ tar -xzf rust-0.7.tar.gz
+    $ cd rust-0.7
     $ ./configure
     $ make && make install
 
@@ -59,8 +59,8 @@ When complete, `make install` will place several programs into
 API-documentation tool, and `rustpkg`, the Rust package manager and build system.
 
 [wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
-[tarball]: http://static.rust-lang.org/dist/rust-0.6.tar.gz
-[win-exe]: http://static.rust-lang.org/dist/rust-0.6-install.exe
+[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz
+[win-exe]: http://static.rust-lang.org/dist/rust-0.7-install.exe
 
 
 ## License