From cbb618a381c3f7cdea95bb400782cc510b790e86 Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Thu, 8 Nov 2018 13:51:46 +0100
Subject: [PATCH] More tweaks for Travis caching

---
 .travis.yml                        | 16 ++++++++--------
 package/linux/travis-build-main.sh |  9 +++++----
 package/osx/travis-build-main.sh   |  2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index edea8c183..1fc7cc158 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,10 +18,10 @@ before_install:
     - export SLIC3R_GIT_VERSION=$(git rev-parse HEAD)
 
 script:
-    - if [[ "${TRAVIS_OS_NAME}" == "linux" && "$BUILD_PL" == true  ]]; then ./package/linux/travis-build-main.sh; fi
-    - if [[ "${TRAVIS_OS_NAME}" == "linux" && "$BUILD_PL" == false ]]; then ./package/linux/travis-build-cpp.sh; fi
-    - if [[ "${TRAVIS_OS_NAME}" == "osx"   && "$BUILD_PL" == true  ]]; then travis_wait 60 ./package/osx/travis-build-main.sh; fi
-    - if [[ "${TRAVIS_OS_NAME}" == "osx"   && "$BUILD_PL" == false ]]; then ./package/osx/travis-build-cpp.sh; fi
+    - if [[ "${TRAVIS_OS_NAME}" == "linux" && "$TARGET" == "main" ]]; then ./package/linux/travis-build-main.sh; fi
+    - if [[ "${TRAVIS_OS_NAME}" == "linux" && "$TARGET" == "cpp"  ]]; then ./package/linux/travis-build-cpp.sh; fi
+    - if [[ "${TRAVIS_OS_NAME}" == "osx"   && "$TARGET" == "main" ]]; then travis_wait 60 ./package/osx/travis-build-main.sh; fi
+    - if [[ "${TRAVIS_OS_NAME}" == "osx"   && "$TARGET" == "cpp"  ]]; then ./package/osx/travis-build-cpp.sh; fi
 
 branches:
   only:
@@ -51,7 +51,7 @@ matrix:
     include:
         - os: linux
           env:
-            - BUILD_PL=true
+            - TARGET=main
           cache:
             directories:
               - $HOME/boost_1_63_0
@@ -63,7 +63,7 @@ matrix:
 
         - os: linux
           env: 
-            - BUILD_PL=false
+            - TARGET=cpp
             - CACHE=$HOME/cache
           cache:
             apt: true
@@ -75,7 +75,7 @@ matrix:
         - os: osx
           osx_image: xcode9.4
           env:
-            - BUILD_PL=true
+            - TARGET=main
           cache:
             directories:
               - /usr/local/Homebrew
@@ -87,7 +87,7 @@ matrix:
         - os: osx
           osx_image: xcode9.4
           env:
-            - BUILD_PL=false
+            - TARGET=cpp
             - CACHE=$HOME/cache
           cache:
             ccache: true
diff --git a/package/linux/travis-build-main.sh b/package/linux/travis-build-main.sh
index 43ec9637c..de6586865 100755
--- a/package/linux/travis-build-main.sh
+++ b/package/linux/travis-build-main.sh
@@ -9,13 +9,16 @@ if [ ! -d $HOME/perl5/perlbrew/perls/slic3r-perl ]; then
     tar -C$HOME/perl5/perlbrew/perls -xjf /tmp/slic3r-perlbrew-5.24.tar.bz2
 fi
 
+source $HOME/perl5/perlbrew/etc/bashrc
+perlbrew switch slic3r-perl
+
 if [ ! -e $HOME/boost_1_63_0/boost/version.hpp ]; then
     echo "Downloading boost_1_63_0.built.gcc-4.9.4-buildserver.tar.bz2"
     curl -L "http://www.siusgs.com/slic3r/buildserver/boost_1_63_0.built.gcc-4.9.4-buildserver.tar.bz2" -o /tmp/boost-compiled.tar.bz2
     tar -C$HOME -xjf /tmp/boost-compiled.tar.bz2
 fi
 
-if !(perl -MWx -e1 2> /dev/null); then
+if [ ! -e ./local-lib/lib/perl5/x86_64-linux-thread-multi/Wx.pm ]; then
     echo "Downloading slic3r-dependencies.gcc49.travis-wx302.tar.bz2"
     curl -L "http://www.siusgs.com/slic3r/buildserver/slic3r-dependencies.travis-wx302.tar.bz2" -o /tmp/local-lib-wx302.tar.bz2
     tar -C$TRAVIS_BUILD_DIR -xjf /tmp/local-lib-wx302.tar.bz2
@@ -25,7 +28,5 @@ if !(perl -MWx -e1 2> /dev/null); then
     tar -C$HOME -xjf /tmp/wx302.tar.bz2
 fi
 
-source $HOME/perl5/perlbrew/etc/bashrc
-perlbrew switch slic3r-perl
-
 SLIC3R_STATIC=1 CC=g++-4.9 CXX=g++-4.9 BOOST_DIR=$HOME/boost_1_63_0 perl ./Build.PL
+perl ./Build.PL --gui
diff --git a/package/osx/travis-build-main.sh b/package/osx/travis-build-main.sh
index aa29c712d..cc2463a35 100755
--- a/package/osx/travis-build-main.sh
+++ b/package/osx/travis-build-main.sh
@@ -9,7 +9,7 @@ export BOOST_DIR=/usr/local
 perl ./Build.PL
 
 # Only recompile Wx if it's not already there
-if !(perl -MWx -e1); then
+if [ ! -e ./local-lib/lib/perl5/darwin-thread-multi-2level/Wx.pm ]; then
     # our patch-wxwidgets.diff assumes Alien::wxWidgets installs wxWidgets 3.0.2
     PERL_USE_UNSAFE_INC=1 \
         CXX="clang++ -mmacosx-version-min=10.12" \