update travis.yml to install tbb during install phase, source script to add variables to current shell

.travis.sh

@@ -3,12 +3,12 @@
 # install TBB with _debug.so files
 function install_tbb()
 {
+  TBBROOT=/tmp/tbb44_20151115oss
+
   if [ "$(uname -s)" == "Linux" ]; then
     wget https://github.com/oneapi-src/oneTBB/releases/download/4.4.2/tbb44_20151115oss_lin.tgz -O /tmp/tbb442.tgz
     tar -C /tmp -xf /tmp/tbb442.tgz
 
-    TBBROOT=/tmp/tbb44_20151115oss
-
     TBB_TARGET_ARCH="intel64"
     library_directory="${TBB_TARGET_ARCH}/gcc4.1"
 
@@ -22,14 +22,12 @@ function install_tbb()
     wget https://github.com/oneapi-src/oneTBB/releases/download/4.4.2/tbb44_20151115oss_osx.tgz -O /tmp/tbb442.tgz
     tar -C /tmp -xf /tmp/tbb442.tgz
 
-    TBBROOT=/tmp/tbb44_20151115oss
-
     # Set library paths
     export LIBRARY_PATH="${TBBROOT}/lib:$LIBRARY_PATH"
     export DYLD_LIBRARY_PATH="${TBBROOT}/lib:$DYLD_LIBRARY_PATH"
   fi
 
-  # CPATH="${TBBROOT}/include:$CPATH"; export CPATH
+  CPATH="${TBBROOT}/include:$CPATH"; export CPATH
 }
 
 # common tasks before either build or test

.travis.yml

@@ -17,13 +17,13 @@ addons:
     - libpython-dev python-numpy
     - libboost-all-dev
 
-before_install:
-  - ./.travis.sh -tbb
+# before_install:
   # - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
 
 install:
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache  ; fi
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then export PATH="/usr/local/opt/ccache/libexec:$PATH" ; fi
+  - source .travis.sh -tbb
 
 # We first do the compile stage specified below, then the matrix expansion specified after.
 stages: