From 310301e964ec313fdcce04e6412ff6102e925ec3 Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Sun, 13 May 2018 11:55:55 -0500 Subject: [PATCH] Build wxwidgets on osx if it's not cached. --- .travis.yml | 2 +- package/linux/travis-setup.sh | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4cd1f75f2..aa55095e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ install: - export SLIC3R_STATIC=1 script: - bash package/linux/travis-setup.sh -- cmake -DBOOST_ROOT=$BOOST_DIR src/ +- cmake -DBOOST_ROOT=$BOOST_DIR -DwxWidgets_ROOT_DIR=$WXDIR src/ - make after_success: - LD_LIBRARY_PATH=$WXDIR/lib package/linux/make_archive.sh linux-x64 diff --git a/package/linux/travis-setup.sh b/package/linux/travis-setup.sh index fc8b83756..0edff8fae 100755 --- a/package/linux/travis-setup.sh +++ b/package/linux/travis-setup.sh @@ -4,6 +4,7 @@ WXVERSION=302 CACHE=$HOME/cache mkdir -p $CACHE if [ $TRAVIS_OS_NAME == "linux" ]; 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 @@ -20,4 +21,17 @@ if [ $TRAVIS_OS_NAME == "linux" ]; then # Set some env variables specific to Travis Linux export CXX=g++-7 export CC=gcc-7 +elif [ $TRAVIS_OS_NAME == "osx" ]; then + WXVERSION=311 + export WXDIR=$HOME/wx${WXVERSION} + if [ ! -e $CACHE/wx${WXVERSION}.tar.bz2 ]; then + curl -L "https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1/wxWidgets-3.1.1.tar.bz2" -o $HOME/wx311-src.tar.bz2 + tar -C$HOME -xjr $HOME/wx311-src.tar.bz2 + mkdir $HOME/wxbuild-${WXVERSION} + cd $HOME/wxbuild-${WXVERSION} && cmake $HOME/wxWidgets-3.1.1 -DwxBUILD_SHARED=off -DCMAKE_INSTALL_PREFIX=${WXDIR} + cmake --build . --target install + tar -C$HOME -cjf $CACHE/wx${WXVERSION}.tar.bz2 $(basename ${WXDIR}) + else + tar -C$HOME -xjf $CACHE/wx${WXVERSION}.tar.bz2 + fi fi