Update .travis.yml

leecoder · leecoder · commit 52466d9f4746 · 2014-07-09T05:42:14.000Z
diff --git a/.travis.yml b/.travis.yml
@@ -2,37 +2,41 @@ language:
     - cpp
 
 compiler:
-    - clang
     - gcc
+    - clang
 
 env:
-    - BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Release"
-    - BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Release"
-    - BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Debug"
-    - BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug"
+    - BOOST_VER=1.54.0 BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Release"
+    - BOOST_VER=1.54.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Release"
+    - BOOST_VER=1.54.0 BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Debug"
+    - BOOST_VER=1.54.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug"
 
 before_install:
-    - sudo add-apt-repository ppa:apokluda/boost1.53 --yes
-    - sudo add-apt-repository ppa:ubuntu-toolchain-r/test --yes # libstdc++-4.8
-    - if [ "${CXX}" == "clang++" ]; then sudo add-apt-repository --yes ppa:h-rayflood/llvm; fi # clang++-3.2
-    - sudo apt-get update
+    - if [ "${CXX}" == "g++" ] || [ ${BUILD_SHARED_LIBS} = "OFF" ]; then
+        sudo add-apt-repository ppa:boost-latest/ppa --yes;
+        sudo apt-get update;
+      fi
+    - if [ "${CXX}" == "clang++" ] && [ ${BUILD_SHARED_LIBS} = "ON" ]; then
+        curl -s http://cznic.dl.sourceforge.net/project/boost/boost/${BOOST_VER}/boost_${BOOST_VER//./_}.tar.bz2|tar xfj - -C ..;
+        export BOOST_ROOT=$TRAVIS_BUILD_DIR/../boost_${BOOST_VER//./_};
+      fi
 
 install:
-    - if [ "${CXX}" == "clang++" ]; then sudo apt-get -qq install clang-3.2; fi
-    - sudo apt-get install g++-4.8; # clang need it for libstdc++ update
-    - sudo apt-get install libboost-system1.53-dev
-    - sudo apt-get install libboost-regex1.53-dev
-    - sudo apt-get install libboost-filesystem1.53-dev
-
-before_script:
-    # update compilers
-    - if [ "${CXX}" == "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
-    - if [ "${CXX}" == "clang++" ]; then export CXX="clang++-3.2" CC="clang-3.2"; fi
+    - if [ "${CXX}" == "g++" ] || [ ${BUILD_SHARED_LIBS} = "OFF" ]; then
+        sudo apt-get install libboost${BOOST_VER/%.0/}-all-dev;
+      fi
+    - if [ "${CXX}" == "clang++" ] && [ ${BUILD_SHARED_LIBS} = "ON" ]; then
+        cd $BOOST_ROOT;
+        ./bootstrap.sh --with-toolset=$CC;
+        ./b2 -j4 --stagedir=.;
+        cd -;
+      fi
 
 script:
-    - mkdir _build
-    - cd _build
-    # Note: clang not support libc++
-    - cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -DCPP-NETLIB_DISABLE_LIBCXX=YES -DCPP-NETLIB_DISABLE_FEATURE_TESTS=YES ..
+    - cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+            -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
     - make
     - make test
+
+after_failure:
+    - cat Testing/Temporary/LastTest.log 
