From 0645976caecc581923d87ca3cc8658a9f7c35f52 Mon Sep 17 00:00:00 2001 From: Tim Landscheidt Date: Sun, 20 Jan 2019 03:46:57 +0000 Subject: Use build matrix to specify Boost versions for Travis CI In Travis CI, versions of libraries, etc. to build against are typically specified in a build matrix. In addition, currently there is no way to build against the distribution-provided Boost version. This change uses a build matrix for BOOST_VERSION and allows that variable to be empty for building against the distribution-provided Boost version. --- tools/travis-before_install.sh | 12 ------------ tools/travis-install.sh | 12 ------------ 2 files changed, 24 deletions(-) delete mode 100755 tools/travis-before_install.sh delete mode 100755 tools/travis-install.sh (limited to 'tools') diff --git a/tools/travis-before_install.sh b/tools/travis-before_install.sh deleted file mode 100755 index 365fcab1..00000000 --- a/tools/travis-before_install.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -#set -x -set -e -set -o pipefail - -if [ -n "${BOOST_VERSION}" ]; then - mkdir -p $BOOST_ROOT - wget --no-verbose --output-document=- \ - http://sourceforge.net/projects/boost/files/boost/${BOOST_VERSION}/boost_${BOOST_VERSION//./_}.tar.bz2/download \ - | tar jxf - --strip-components=1 -C "${BOOST_ROOT}" -fi diff --git a/tools/travis-install.sh b/tools/travis-install.sh deleted file mode 100755 index 995f18df..00000000 --- a/tools/travis-install.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -#set -x -set -e -set -o pipefail - -if [ -d "${BOOST_ROOT}" ]; then - (cd "${BOOST_ROOT}" - ./bootstrap.sh --with-libraries="${BOOST_LIBS}" - ./b2 threading=multi --prefix="${BOOST_ROOT}" -d0 install - ) -fi -- cgit v1.2.3