Merge branch 'develop'

Travis improvements.

.travis.yml

@@ -11,32 +11,61 @@ language: c++
 addons:
     apt:
         packages:
-            - libboost-dev
             - libboost-tools-dev
 
 matrix:
     include:
       - compiler: gcc
-        env: BJAM_TOOLSET=gcc-std03
+        env: |
+            USER_CONFIG="using gcc : : g++-4.8 -Werror --std=c++03 ;"
       - compiler: gcc
-        env: BJAM_TOOLSET=gcc-std11
+        env: |
+            USER_CONFIG="using gcc : : g++-4.8 -Werror --std=c++11 ;"
       - compiler: clang
-        env: BJAM_TOOLSET=clang-std03
+        env: |
+            USER_CONFIG="using clang : : clang++ -Werror --std=c++03 ;"
       - compiler: clang
-        env: BJAM_TOOLSET=clang-std11
+        env: |
+            USER_CONFIG="using clang : : clang++ -Werror --std=c++11 ;"
       - compiler: clang
-        env: BJAM_TOOLSET=clang-pretend_no_auto_ptr_etc
+        env: |
+            USER_CONFIG="using clang : : clang++ -Werror --std=c++11 -D_HAS_AUTO_PTR_ETC=0 ;"
 
 before_script:
-    - |
+    - export BOOST_VERSION=1.65.1
-        echo "using gcc : std03 : g++-4.8 -Werror --std=c++03 ;" > ~/user-config.jam
+    - export BOOST_FILENAME=boost_1_65_1
-        echo "using gcc : std11 : g++-4.8 -Werror --std=c++11 ;" >> ~/user-config.jam
+    - export BOOST_ROOT=${HOME}/boost
-        echo "using clang : std03 : clang++ -Werror --std=c++03 ;" >> ~/user-config.jam
+    - cd ${TRAVIS_BUILD_DIR}
-        echo "using clang : std11 : clang++ -Werror --std=c++11 ;" >> ~/user-config.jam
-        echo "using clang : pretend_no_auto_ptr_etc : clang++ -Werror --std=c++11 -D_HAS_AUTO_PTR_ETC=0 ;" >> ~/user-config.jam
-    - cat ~/user-config.jam
     - touch Jamroot.jam
+    - cd $HOME
+    - echo $USER_CONFIG > ~/user-config.jam
+    - cat ~/user-config.jam
+    - |
+        mkdir $HOME/download
+        mkdir $HOME/extract
+        cd $HOME/download
+        if [ "$TRAVIS_EVENT_TYPE" == "cron" ]
+        then
+            if [ "$TRAVIS_BRANCH" == "master" ]
+            then
+                snapshot_branch=master
+            else
+                snapshot_branch=develop
+            fi
+            download_url=$(curl https://api.bintray.com/packages/boostorg/$snapshot_branch/snapshot/files |
+                    python -c "import os.path, sys, json; x = json.load(sys.stdin); print '\n'.join(a['path'] for a in x if os.path.splitext(a['path'])[1] == '.bz2')" |
+                    head -n 1 |
+                    sed "s/^/http:\/\/dl.bintray.com\/boostorg\/$snapshot_branch\//")
+        else
+            download_url=https://sourceforge.net/projects/boost/files/boost/${BOOST_VERSION}/${BOOST_FILENAME}.tar.bz2/download
+        fi
+        echo "Downloading ${download_url}"
+        wget -O boost.tar.bz2 $download_url
+        cd $HOME/extract
+        tar -xjf $HOME/download/boost.tar.bz2
+        mv * ${BOOST_ROOT}
+    - rm -r ${BOOST_ROOT}/boost/functional
 
 script:
     - cd ${TRAVIS_BUILD_DIR}/test
-    - bjam -q ${BJAM_TOOLSET} include=${TRAVIS_BUILD_DIR}/include
+    - bjam -q ${BJAM_TOOLSET} include=${BOOST_ROOT} include=${TRAVIS_BUILD_DIR}/include