mirror of
https://github.com/servo/servo.git
synced 2025-08-05 13:40:08 +01:00
Use downloaded snapshots instead of in-tree rust. Also a working linux travis conf
This commit is contained in:
parent
58b776e0b5
commit
746ae7625b
4 changed files with 51 additions and 1 deletions
28
.travis.yml
Normal file
28
.travis.yml
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
language: c
|
||||||
|
|
||||||
|
install:
|
||||||
|
- 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
|
||||||
|
before_script:
|
||||||
|
- mkdir -p build
|
||||||
|
|
||||||
|
script: |
|
||||||
|
cd build
|
||||||
|
../configure
|
||||||
|
make -j2
|
||||||
|
make check
|
||||||
|
|
||||||
|
git:
|
||||||
|
submodules: true
|
||||||
|
|
||||||
|
notifications:
|
||||||
|
email: false
|
||||||
|
|
||||||
|
branches:
|
||||||
|
only:
|
||||||
|
- travis
|
||||||
|
- master
|
||||||
|
after_success:
|
21
configure
vendored
21
configure
vendored
|
@ -401,6 +401,26 @@ probe CFG_CLANG clang++
|
||||||
|
|
||||||
CFG_BUILD_DIR="${CFG_BUILD_HOME}${CFG_TARGET}/"
|
CFG_BUILD_DIR="${CFG_BUILD_HOME}${CFG_TARGET}/"
|
||||||
make_dir "${CFG_BUILD_DIR}"
|
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" ]
|
if [ ! -z "$CFG_LOCAL_RUST_ROOT" ]
|
||||||
then
|
then
|
||||||
|
@ -560,6 +580,7 @@ putvar CFG_RUST_HOME
|
||||||
putvar CFG_PATH
|
putvar CFG_PATH
|
||||||
putvar CFG_LOCAL_RUSTC
|
putvar CFG_LOCAL_RUSTC
|
||||||
putvar CFG_LOCAL_RUST_ROOT
|
putvar CFG_LOCAL_RUST_ROOT
|
||||||
|
putvar CFG_TREE_RUST
|
||||||
putvar CFG_ENABLE_DEBUG
|
putvar CFG_ENABLE_DEBUG
|
||||||
putvar CFG_ENABLE_DEBUG_SKIA
|
putvar CFG_ENABLE_DEBUG_SKIA
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit d35a38087088301aa58f244ae99d48b282df6fb2
|
Subproject commit 0935beba717bf6d3b54ad1b2eace359dea5dfca0
|
1
src/compiler/rust-snapshot-hash
Normal file
1
src/compiler/rust-snapshot-hash
Normal file
|
@ -0,0 +1 @@
|
||||||
|
0935beba717bf6d3b54ad1b2eace359dea5dfca0/rust-0.11.0-pre
|
Loading…
Add table
Add a link
Reference in a new issue