---

yaml
---
r: 38812
b: refs/heads/incoming
c: ea99655
h: refs/heads/master
v: v3

Author: z0w0

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: dd76050e511ba367145b7debaac44687b9cdf9f1
+refs/heads/incoming: ea996556b93f3f322145fedb5a46fe97e8d0379a
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/.gitignore

@@ -55,6 +55,7 @@ version.texi
 config.mk
 /rt/
 /rustllvm/
+/linenoise
 /test/
 /build/
 /inst/
@@ -80,4 +81,3 @@ tmp.*.rs
 config.stamp
 .DS_Store
 src/etc/dl
-.settings/

branches/incoming/AUTHORS.txt

@@ -23,6 +23,7 @@ Benjamin Peterson <[email protected]>
 Brendan Eich <[email protected]>
 Brian Anderson <[email protected]>
 Brian J. Burg <[email protected]>
+Brian Leibig <[email protected]>
 Chris Double <[email protected]>
 Chris Peterson <[email protected]>
 Damian Gryski <[email protected]>
@@ -41,7 +42,6 @@ Erick Tryzelaar <[email protected]>
 Erik Rose <[email protected]>
 Evan McClanahan <[email protected]>
 Francisco Souza <[email protected]>
-Gabriel <[email protected]>
 Gareth Daniel Smith <[email protected]>
 Glenn Willen <[email protected]>
 Gonçalo Cabrita <[email protected]>
@@ -73,9 +73,7 @@ Kevin Cantu <[email protected]>
 Lennart Kudling
 Lindsey Kuper <[email protected]>
 Luca Bruno <[email protected]>
-Luqman Aden <[email protected]>
 Magnus Auvinen <[email protected]>
-Mahmut Bulut <[email protected]>
 Margaret Meyerhofer <[email protected]>
 Marijn Haverbeke <[email protected]>
 Matt Brubeck <[email protected]>
@@ -108,7 +106,6 @@ Tim Chevalier <[email protected]>
 Tom Lee <[email protected]>
 Tomoki Aonuma <[email protected]>
 Tycho Sci <[email protected]>
-Viktor Dahl <[email protected]>
 Vincent Belliard <[email protected]>
 Wade Mealing <[email protected]>
 Yasuhiro Fujii <[email protected]>

branches/incoming/Makefile.in

@@ -132,7 +132,7 @@ LIBSYNTAX_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,syntax)
 
 # version-string calculation
 CFG_GIT_DIR := $(CFG_SRC_DIR).git
-CFG_RELEASE = 0.5
+CFG_RELEASE = 0.4
 CFG_VERSION = $(CFG_RELEASE)
 
 ifneq ($(wildcard $(CFG_GIT)),)
@@ -144,9 +144,8 @@ ifneq ($(wildcard $(CFG_GIT_DIR)),)
 endif
 endif
 
-ifdef CFG_ENABLE_VALGRIND
-  $(info cfg: enabling valgrind (CFG_ENABLE_VALGRIND))
-else
+ifdef CFG_DISABLE_VALGRIND
+  $(info cfg: disabling valgrind (CFG_DISABLE_VALGRIND))
   CFG_VALGRIND :=
 endif
 ifdef CFG_BAD_VALGRIND
@@ -451,8 +450,9 @@ TSREQS :=											\
 FUZZ := $(HBIN2_H_$(CFG_HOST_TRIPLE))/fuzzer$(X)
 CARGO := $(HBIN2_H_$(CFG_HOST_TRIPLE))/cargo$(X)
 RUSTDOC := $(HBIN2_H_$(CFG_HOST_TRIPLE))/rustdoc$(X)
+RUSTI := $(HBIN2_H_$(CFG_HOST_TRIPLE))/rusti$(X)
 
-all: rustc $(GENERATED) docs $(FUZZ) $(CARGO) $(RUSTDOC)
+all: rustc $(GENERATED) docs $(FUZZ) $(CARGO) $(RUSTDOC) $(RUSTI)
 
 endif
 

branches/incoming/configure

@@ -187,7 +187,6 @@ need_cmd cmp
 need_cmd mkdir
 need_cmd printf
 need_cmd cut
-need_cmd head
 need_cmd grep
 need_cmd xargs
 need_cmd cp
@@ -258,16 +257,6 @@ case $CFG_CPUTYPE in
         err "unknown CPU type: $CFG_CPUTYPE"
 esac
 
-# Detect 64 bit linux systems with 32 bit userland and force 32 bit compilation
-if [ $CFG_OSTYPE = unknown-linux-gnu -a $CFG_CPUTYPE = x86_64 ]
-then
-    file -L "$SHELL" | grep -q "x86[_-]64"
-    if [ $? != 0 ]; then
-        CFG_CPUTYPE=i686
-    fi
-fi
-
-
 DEFAULT_HOST_TRIPLE="${CFG_CPUTYPE}-${CFG_OSTYPE}"
 
 CFG_SRC_DIR="$(cd $(dirname $0) && pwd)/"
@@ -294,7 +283,7 @@ else
 fi
 
 opt sharedstd 1 "build libstd as a shared library"
-opt valgrind 0 "run tests with valgrind (memcheck by default)"
+opt valgrind 1 "run tests with valgrind (memcheck by default)"
 opt helgrind 0 "run tests with helgrind instead of memcheck"
 opt docs     1 "build documentation"
 opt optimize 1 "build optimized rust code"
@@ -363,16 +352,11 @@ fi
 
 if [ ! -z "$CFG_PANDOC" ]
 then
-    PANDOC_VER_LINE=$(pandoc --version | grep '^pandoc ')
-    PANDOC_VER=${PANDOC_VER_LINE#pandoc }
-    PV_MAJOR_MINOR=${PANDOC_VER%.[0-9]*}
-    PV_MAJOR=${PV_MAJOR_MINOR%%[.][0-9]*}
-    PV_MINOR=${PV_MAJOR_MINOR#[0-9]*[.]}
-    PV_MINOR=${PV_MINOR%%[.][0-9]*}
-    if [ "$PV_MAJOR" -lt "1" ] || [ "$PV_MINOR" -lt "8" ]
+    PV=$(pandoc --version | awk '/^pandoc/ {print $2}')
+    if [ "$PV" \< "1.8" ]
     then
-		step_msg "pandoc $PV_MAJOR.$PV_MINOR is too old. disabling"
-		BAD_PANDOC=1
+	step_msg "pandoc $PV is too old. disabling"
+	BAD_PANDOC=1
     fi
 fi
 
@@ -529,7 +513,7 @@ for t in $CFG_TARGET_TRIPLES
 do
   make_dir rt/$t
   for i in                                          \
-    isaac bigint sync test arch/i386 arch/x86_64    \
+    isaac linenoise bigint sync test arch/i386 arch/x86_64    \
     libuv libuv/src/ares libuv/src/eio libuv/src/ev
   do
     make_dir rt/$t/$i
@@ -595,7 +579,7 @@ then
     need_ok "git failed"
 
     msg "git: submodule foreach sync"
-    "${CFG_GIT}" submodule --quiet foreach --recursive 'if test -e .gitmodules; then git submodule sync; fi'
+    "${CFG_GIT}" submodule --quiet foreach --recursive git submodule sync
     need_ok "git failed"
 
     msg "git: submodule foreach update"