From d325248baf56a979eb38f9eba30878538a96e09a Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Sun, 2 Apr 2017 09:23:42 -0500 Subject: [PATCH] Load precached wxlibs --- package/linux/travis-setup.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/package/linux/travis-setup.sh b/package/linux/travis-setup.sh index b0ba363166..fc843a57a2 100755 --- a/package/linux/travis-setup.sh +++ b/package/linux/travis-setup.sh @@ -10,10 +10,17 @@ if [ ! -e $HOME/cache/boost-compiled.tar.bz2 ]; then curl -L "http://www.siusgs.com/slic3r/buildserver/boost_1_63_0.built.gcc-4.9.4-buildserver.tar.bz2" -o $HOME/cache/boost-compiled.tar.bz2 fi -if [ ! -e $HOME/cache/local-lib-wx$WXVERSION.tar.bz2 ]; then - curl -L "http://www.siusgs.com/slic3r/buildserver/slic3r-dependencies.travis-wx$WXVERSION.tar.bz2" -o $HOME/cache/local-lib-wx$WXVERSION.tar.bz2 +if [ ! -e $HOME/cache/local-lib-wx${WXVERSION}.tar.bz2 ]; then + curl -L "http://www.siusgs.com/slic3r/buildserver/slic3r-dependencies.travis-wx${WXVERSION}.tar.bz2" -o $HOME/cache/local-lib-wx${WXVERSION}.tar.bz2 fi -tar -C$TRAVIS_BUILD_DIR -xjf $HOME/cache/local-lib-wx$WXVERSION.tar.bz2 +if [ ! -e $HOME/cache/wx${WXVERSION}.tar.bz2 ]; then + curl -L "http://www.siusgs.com/slic3r/buildserver/wx${WXVERSION}-libs.tar.bz2" -o $HOME/cache/wx${WXVERSION}.tar.bz2 +fi + + + +tar -C$TRAVIS_BUILD_DIR -xjf $HOME/cache/local-lib-wx${WXVERSION}.tar.bz2 tar -C$HOME/perl5/perlbrew/perls -xjf $HOME/cache/slic3r-perlbrew-5.24.tar.bz2 tar -C$HOME -xjf $HOME/cache/boost-compiled.tar.bz2 +tar -C$HOME -xjf $HOME/cache/wx${WXVERSION}.tar.bz2