Build 10.11 instead of 10.10; fix branch name detection; cache PAR::Packer

.travis.yml

@@ -72,7 +72,7 @@ matrix:
             - package/linux/travis-deploy-cpp.sh
 
         - os: osx
-          osx_image: xcode6.4 # OS X 10.10
+          osx_image: xcode8 # OS X 10.11
           env:
             - TARGET=main
           cache:

package/osx/make_dmg.sh

@@ -25,18 +25,17 @@ if [ $(git describe --exact-match &>/dev/null) ]; then
     SLIC3R_BUILD_ID=$(git describe)
 else
     # Get the current branch
-    if [ -z ${GIT_BRANCH+x} ] && [ -z ${APPVEYOR_REPO_BRANCH+x} ]; then
+    if [ ! -z ${GIT_BRANCH+x} ]; then
-        current_branch=$(git symbolic-ref HEAD | sed 's!refs\/heads\/!!')
+        echo "Setting to GIT_BRANCH"
+        current_branch=$(echo $GIT_BRANCH | cut -d / -f 2)
+    elif [ ! -z ${TRAVIS_BRANCH+x} ]; then
+        echo "Setting to TRAVIS_BRANCH"
+        current_branch=$TRAVIS_BRANCH
+    elif [ ! -z ${APPVEYOR_REPO_BRANCH+x} ]; then
+        echo "Setting to APPVEYOR_REPO_BRANCH"
+        current_branch=$APPVEYOR_REPO_BRANCH
     else
-        current_branch="unknown"
+        current_branch=$(git symbolic-ref HEAD | sed 's!refs\/heads\/!!')
-        if [ ! -z ${GIT_BRANCH+x} ]; then
-            echo "Setting to GIT_BRANCH"
-            current_branch=$(echo $GIT_BRANCH | cut -d / -f 2)
-        fi
-        if [ ! -z ${APPVEYOR_REPO_BRANCH+x} ]; then
-            echo "Setting to APPVEYOR_REPO_BRANCH"
-            current_branch=$APPVEYOR_REPO_BRANCH
-        fi
     fi
     
     if [ "$current_branch" == "master" ]; then
@@ -53,8 +52,6 @@ fi
 dmgfile=slic3r-${SLIC3R_BUILD_ID}.dmg
 echo "DMG filename: ${dmgfile}"
 
-# If we're on a branch, add the branch name to the app name.
-
 rm -rf $WD/_tmp
 mkdir -p $WD/_tmp
 

package/osx/travis-build-main.sh

@@ -11,3 +11,6 @@ perl ./Build.PL
 
 export LIBRARY_PATH=/usr/local/lib
 perl ./Build.PL --gui
+
+# Install PAR::Packer now so that it gets cached by Travis
+cpanm --local-lib local-lib PAR::Packer