GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-01 01:22:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix boost download and travis

Browse Source
This commit is contained in:
Joseph Lenox 2018-05-13 22:52:01 -05:00
parent 1430180b24
commit 86b98c4eb6
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -1,11 +1,10 @@
before_install: before_install:
- sh package/linux/travis-decrypt-key - sh package/linux/travis-decrypt-key
- bash package/linux/travis-setup.sh
- eval "${MATRIX_EVAL}"
env: env:
- BOOST_DIR=$HOME/boost_1_63_0 - BOOST_DIR=$HOME/boost_1_63_0
- SLIC3R_STATIC=1 - SLIC3R_STATIC=1
script: script:
- bash package/linux/travis-setup.sh
- cmake -DBOOST_ROOT=$BOOST_DIR src/ - cmake -DBOOST_ROOT=$BOOST_DIR src/
- make - make
after_success: after_success:
@ -51,7 +50,8 @@ matrix:
- os: linux - os: linux
env: env:
- WXVERSION=pkg - WXVERSION=pkg
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" - CC=gcc-7
- CXX-g++-7
- os: osx - os: osx
env: env:
- WXVERSION=pkg - WXVERSION=pkg

13
package/linux/travis-setup.sh
View File

@ -5,19 +5,18 @@ mkdir -p $CACHE
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
if [[ "$WXVERSION" != "pkg" ]]; then if [[ "$WXVERSION" != "pkg" ]]; then
export WXDIR=$HOME/wx${WXVERSION} 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 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" 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 curl -L "http://www.siusgs.com/slic3r/buildserver/wx${WXVERSION}-libs.tar.bz2" -o $CACHE/wx${WXVERSION}.tar.bz2
fi fi
tar -C$HOME -xjf $CACHE/boost-compiled.tar.bz2
tar -C$HOME -xjf $CACHE/wx${WXVERSION}.tar.bz2 tar -C$HOME -xjf $CACHE/wx${WXVERSION}.tar.bz2
fi 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 elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
if [[ "$WXVERSION" != "pkg" ]]; then if [[ "$WXVERSION" != "pkg" ]]; then