From cc45494a2dd72c5de8b69da0a376f0b67231300a Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Sun, 2 Apr 2017 08:24:44 -0500 Subject: [PATCH] Switched to using wx 3.0.2 --- package/linux/travis-setup.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/package/linux/travis-setup.sh b/package/linux/travis-setup.sh index cfc67227b7..b0ba363166 100755 --- a/package/linux/travis-setup.sh +++ b/package/linux/travis-setup.sh @@ -1,5 +1,7 @@ #!/bin/bash # Script to configure travis environment prior to build +WXVERSION=302 + if [ ! -e $HOME/cache/slic3r-perlbrew-5.24.tar.bz2 ]; then curl -L "https://bintray.com/lordofhyphens/Slic3r/download_file?file_path=slic3r-perl.524.travis.tar.bz2" -o $HOME/cache/slic3r-perlbrew-5.24.tar.bz2; fi @@ -8,10 +10,10 @@ 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.tar.bz2 ]; then - curl -L "http://www.siusgs.com/slic3r/buildserver/slic3r-dependencies.travis.tar.bz2" -o $HOME/cache/local-lib.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.tar.bz2 +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