diff options
author | John Wiegley <johnw@newartisans.com> | 2019-01-25 15:48:11 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-25 15:48:11 -0800 |
commit | 14dc0b912bb9e51f28fa10e03fba962dec22c870 (patch) | |
tree | ae286447fecf8e42a9cb6567cdfa02a3b63efefd /tools | |
parent | d167ef36962614be5fcba22a18f8f1abc91e02fd (diff) | |
parent | 0645976caecc581923d87ca3cc8658a9f7c35f52 (diff) | |
download | fork-ledger-14dc0b912bb9e51f28fa10e03fba962dec22c870.tar.gz fork-ledger-14dc0b912bb9e51f28fa10e03fba962dec22c870.tar.bz2 fork-ledger-14dc0b912bb9e51f28fa10e03fba962dec22c870.zip |
Merge pull request #1742 from scfc/rephrase-boost-build-matrix
Rephrase Boost build matrix
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/travis-before_install.sh | 16 | ||||
-rwxr-xr-x | tools/travis-install.sh | 22 |
2 files changed, 0 insertions, 38 deletions
diff --git a/tools/travis-before_install.sh b/tools/travis-before_install.sh deleted file mode 100755 index fe010945..00000000 --- a/tools/travis-before_install.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -#set -x -set -e -set -o pipefail - -if [ "${TRAVIS_OS_NAME}" = "osx" ]; then - brew update -fi - -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 4e8bdc48..00000000 --- a/tools/travis-install.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash - -#set -x -set -e -set -o pipefail - -if [ "${TRAVIS_OS_NAME}" = "osx" ]; then - for formula in $(echo "${BREWS//,/ }"); do - echo "Checking ${formula} formula" - brew outdated "${formula}" \ - || (brew unlink "${formula}" - brew install "${formula}" - ) - done -fi - -if [ -d "${BOOST_ROOT}" ]; then - (cd "${BOOST_ROOT}" - ./bootstrap.sh --with-libraries="${BOOST_LIBS}" - ./b2 threading=multi --prefix="${BOOST_ROOT}" -d0 install - ) -fi |