servo: Merge #2671 - Update to use snapshot builds (from larsbergstrom:new_snapshots)

Source-Repo: https://github.com/servo/servo
Source-Revision: 54f01aa4f4b58eba480c3c5c120c16a62372fc6c

servo/.travis.yml

@@ -0,0 +1,29 @@
+language: c
+
+os:
+- linux
+- osx
+
+install:
+- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then  ./travis.linux.install.deps.sh; fi
+- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then ./travis.osx.install.deps.sh; fi
+
+before_script:
+  - mkdir -p build
+
+script: 
+- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then  ./travis.linux.script.sh; fi
+- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then ./travis.osx.script.sh; fi
+
+git:
+  submodules: true
+
+notifications:
+  email: false
+
+branches:
+  only:
+    - travis
+    - master
+
+after_success:

servo/configure

@@ -401,6 +401,26 @@ probe CFG_CLANG            clang++
 
 CFG_BUILD_DIR="${CFG_BUILD_HOME}${CFG_TARGET}/"
 make_dir "${CFG_BUILD_DIR}"
+SNAPSHOT_VERSION=$(cat ${CFG_SRC_DIR}/src/compiler/rust-snapshot-hash | rev | cut -d/ -f1 | rev)
+if [ $CFG_OSTYPE = "linux-androideabi" ]
+then
+CFG_TREE_RUST=1 # We don't yet have Android snapshots
+fi
+if [ -z "$CFG_TREE_RUST" ]
+then
+    if ! [ -f ${CFG_BUILD_DIR}/rust_snapshot/${SNAPSHOT_VERSION}-${DEFAULT_TARGET}/bin/rustc -a -f ${CFG_BUILD_DIR}/src/compiler/rust-snapshot-hash-stamp -a -z "$(diff ${CFG_BUILD_DIR}/src/compiler/rust-snapshot-hash-stamp ${CFG_SRC_DIR}/src/compiler/rust-snapshot-hash)" ]
+    then
+    rm -rf ${CFG_BUILD_DIR}/rust_snapshot
+    make_dir ${CFG_BUILD_DIR}/rust_snapshot
+    make_dir ${CFG_BUILD_DIR}/src/compiler/rust
+    SNAPSHOT_URL="http://servo-rust.s3.amazonaws.com/$(cat ${CFG_SRC_DIR}/src/compiler/rust-snapshot-hash)-${DEFAULT_TARGET}.tar.gz"
+    step_msg "Fetching snapshot from ${SNAPSHOT_URL}"
+    curl -o ${CFG_BUILD_DIR}/rust_snapshot/snapshot.tgz ${SNAPSHOT_URL}
+    tar -zxf ${CFG_BUILD_DIR}/rust_snapshot/snapshot.tgz -C ${CFG_BUILD_DIR}/rust_snapshot/
+    cp -f ${CFG_SRC_DIR}/src/compiler/rust-snapshot-hash ${CFG_BUILD_DIR}/src/compiler/rust-snapshot-hash-stamp
+    fi
+    CFG_LOCAL_RUST_ROOT=${CFG_BUILD_DIR}/rust_snapshot/${SNAPSHOT_VERSION}-${DEFAULT_TARGET}
+fi
 
 if [ ! -z "$CFG_LOCAL_RUST_ROOT" ]
 then
@@ -560,6 +580,7 @@ putvar CFG_RUST_HOME
 putvar CFG_PATH
 putvar CFG_LOCAL_RUSTC
 putvar CFG_LOCAL_RUST_ROOT
+putvar CFG_TREE_RUST
 putvar CFG_ENABLE_DEBUG
 putvar CFG_ENABLE_DEBUG_SKIA
 

servo/mk/check.mk

@@ -79,13 +79,19 @@ check-servo: $(foreach lib_crate,$(SERVO_LIB_CRATES),check-servo-$(lib_crate)) s
 	@$(call E, check: servo)
 	$(Q)./servo-test
 
-.PHONY: check-ref
+.PHONY: check-ref-cpu
-check-ref: reftest
+check-ref-cpu: reftest
-	@$(call E, check: reftests with GPU rendering)
-	$(Q)./reftest $(S)src/test/ref/*.list
 	@$(call E, check: reftests with CPU rendering)
 	$(Q)./reftest $(S)src/test/ref/*.list -- -c
 
+.PHONY: check-ref-gpu
+check-ref-gpu: reftest
+	@$(call E, check: reftests with GPU rendering)
+	$(Q)./reftest $(S)src/test/ref/*.list
+
+.PHONY: check-ref
+check-ref: check-ref-cpu check-ref-gpu
+
 .PHONY: check-content
 check-content: contenttest
 	@$(call E, check: contenttests)

servo/src/compiler/rust-snapshot-hash

@@ -0,0 +1 @@
+0935beba717bf6d3b54ad1b2eace359dea5dfca0/rust-0.11.0-pre

servo/travis.linux.install.deps.sh

@@ -0,0 +1,5 @@
+sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+sudo apt-get update -q
+sudo apt-get install -qq --force-yes -y autoconf2.13 gperf libxxf86vm-dev libglfw-dev libstdc++6-4.7-dev
+echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | sudo debconf-set-selections
+sudo apt-get install ttf-mscorefonts-installer > /dev/null

servo/travis.linux.script.sh

@@ -0,0 +1,3 @@
+cd build
+../configure
+make -j2 && make check-servo

servo/travis.osx.install.deps.sh

@@ -0,0 +1,2 @@
+brew install https://raw.github.com/Homebrew/homebrew-versions/master/autoconf213.rb
+brew install automake libtool pkg-config

servo/travis.osx.script.sh

@@ -0,0 +1,3 @@
+cd build
+../configure
+make -j2 && make check-servo && make check-content && make check-ref-cpu