mirror of
https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git
synced 2025-07-31 03:52:01 +08:00
Fix boost download and travis
This commit is contained in:
parent
1430180b24
commit
86b98c4eb6
@ -1,11 +1,10 @@
|
||||
before_install:
|
||||
- sh package/linux/travis-decrypt-key
|
||||
- bash package/linux/travis-setup.sh
|
||||
- eval "${MATRIX_EVAL}"
|
||||
env:
|
||||
- BOOST_DIR=$HOME/boost_1_63_0
|
||||
- SLIC3R_STATIC=1
|
||||
script:
|
||||
- bash package/linux/travis-setup.sh
|
||||
- cmake -DBOOST_ROOT=$BOOST_DIR src/
|
||||
- make
|
||||
after_success:
|
||||
@ -51,7 +50,8 @@ matrix:
|
||||
- os: linux
|
||||
env:
|
||||
- WXVERSION=pkg
|
||||
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
|
||||
- CC=gcc-7
|
||||
- CXX-g++-7
|
||||
- os: osx
|
||||
env:
|
||||
- WXVERSION=pkg
|
||||
|
@ -5,19 +5,18 @@ mkdir -p $CACHE
|
||||
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
||||
if [[ "$WXVERSION" != "pkg" ]]; then
|
||||
export WXDIR=$HOME/wx${WXVERSION}
|
||||
if [ ! -e $CACHE/boost-compiled.tar.bz2 ]; then
|
||||
echo "Downloading http://www.siusgs.com/slic3r/buildserver/boost_1_63_0.built.gcc-4.9.4-buildserver.tar.bz2 => $CACHE/boost-compiled.tar.bz2"
|
||||
curl -L "http://www.siusgs.com/slic3r/buildserver/boost_1_63_0.built.gcc-4.9.4-buildserver.tar.bz2" -o $CACHE/boost-compiled.tar.bz2
|
||||
fi
|
||||
|
||||
if [ ! -e $CACHE/wx${WXVERSION}.tar.bz2 ]; then
|
||||
echo "Downloading http://www.siusgs.com/slic3r/buildserver/wx${WXVERSION}-libs.tar.bz2 => $CACHE/wx${WXVERSION}.tar.bz2"
|
||||
curl -L "http://www.siusgs.com/slic3r/buildserver/wx${WXVERSION}-libs.tar.bz2" -o $CACHE/wx${WXVERSION}.tar.bz2
|
||||
fi
|
||||
|
||||
tar -C$HOME -xjf $CACHE/boost-compiled.tar.bz2
|
||||
tar -C$HOME -xjf $CACHE/wx${WXVERSION}.tar.bz2
|
||||
fi
|
||||
if [ ! -e $CACHE/boost-compiled.tar.bz2 ]; then
|
||||
echo "Downloading http://www.siusgs.com/slic3r/buildserver/boost_1_63_0.built.gcc-4.9.4-buildserver.tar.bz2 => $CACHE/boost-compiled.tar.bz2"
|
||||
curl -L "http://www.siusgs.com/slic3r/buildserver/boost_1_63_0.built.gcc-4.9.4-buildserver.tar.bz2" -o $CACHE/boost-compiled.tar.bz2
|
||||
fi
|
||||
|
||||
tar -C$HOME -xjf $CACHE/boost-compiled.tar.bz2
|
||||
|
||||
elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
||||
if [[ "$WXVERSION" != "pkg" ]]; then
|
||||
|
Loading…
x
Reference in New Issue
Block a user