diff options
Diffstat (limited to '')
| -rw-r--r-- | .travis.yml | 27 | ||||
| -rw-r--r-- | .travis/.gitattributes | 1 | ||||
| -rwxr-xr-x | .travis/build.sh | 22 | ||||
| -rwxr-xr-x | .travis/build_boost.sh | 35 |
4 files changed, 20 insertions, 65 deletions
diff --git a/.travis.yml b/.travis.yml index da10b09..657cbbf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,15 +10,28 @@ addons: env: global: - - boost_version=1.71.0 + - travis_boost_version=1.71.0 matrix: - - build_type=debug arch=x86 - - build_type=release arch=x86 - - build_type=debug arch=x64 - - build_type=release arch=x64 + - configuration=Debug platform=x86 + - configuration=Release platform=x86 + - configuration=Debug platform=x64 + - configuration=Release platform=x64 before_script: - - ./.travis/build_boost.sh + - |- + ./cmake/build/boost/build_travis.sh \ + target-os=windows \ + --user-config="$TRAVIS_BUILD_DIR/cmake/toolchains/boost/mingw-w64-$platform.jam" \ + --with-filesystem \ + --with-program_options \ + --with-system script: - - ./.travis/build.sh + - |- + ./cmake/build/build_travis.py \ + --configuration "$configuration" \ + --install "$HOME/install" \ + --boost "$HOME/boost_1_71_0" \ + --toolchain "./cmake/toolchains/mingw-w64-$platform.cmake" \ + --boost-librarydir "$HOME/boost_1_71_0/stage/$platform/${configuration,,}/lib" \ + -- -DCMAKE_SYSTEM_NAME=Windows diff --git a/.travis/.gitattributes b/.travis/.gitattributes deleted file mode 100644 index dfdb8b7..0000000 --- a/.travis/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -*.sh text eol=lf diff --git a/.travis/build.sh b/.travis/build.sh deleted file mode 100755 index 902d23a..0000000 --- a/.travis/build.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit -o nounset -o pipefail -o xtrace - -readonly boost_fs="boost_${boost_version//\./_}" - -readonly boost_dir="$HOME/$boost_fs" -readonly boost_librarydir="$boost_dir/stage/$arch/$build_type/lib" - -cd -- "$HOME" -mkdir -- cmake -cd -- cmake/ - -cmake \ - -D "CMAKE_BUILD_TYPE=$build_type" \ - -D "CMAKE_TOOLCHAIN_FILE=$TRAVIS_BUILD_DIR/cmake/toolchains/mingw-w64-$arch.cmake" \ - -D "BOOST_ROOT=$boost_dir" \ - -D "BOOST_LIBRARYDIR=$boost_librarydir" \ - -D CMAKE_SYSTEM_NAME=Windows \ - "$TRAVIS_BUILD_DIR" - -cmake --build . -- -j diff --git a/.travis/build_boost.sh b/.travis/build_boost.sh deleted file mode 100755 index 9efb832..0000000 --- a/.travis/build_boost.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit -o nounset -o pipefail -o xtrace - -readonly boost_fs="boost_${boost_version//\./_}" -readonly boost_url=https://dl.bintray.com/boostorg/release/$boost_version/source/$boost_fs.tar.gz - -cd -- "$HOME/" - -wget -- "$boost_url" -tar xzvf "$boost_fs.tar.gz" > /dev/null -cd -- "$boost_fs/" -./bootstrap.sh - -compiler_prefix=i686 -[ "$arch" = x64 ] && compiler_prefix=x86_64 - -readonly cxx="$compiler_prefix-w64-mingw32-g++" - -echo "using gcc : : $cxx ;" > "user-config-$arch.jam" - -address_model=32 -[ "$arch" = x64 ] && address_model=64 - -./b2 \ - toolset=gcc \ - "address-model=$address_model" \ - target-os=windows \ - link=static \ - variant="$build_type" \ - "--stagedir=stage/$arch/$build_type" \ - "--user-config=user-config-$arch.jam" \ - --with-filesystem \ - --with-program_options \ - --with-system |