diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2017-02-08 13:26:23 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2017-02-08 19:07:16 +0100 |
| commit | bb931505c5f11c21a31cdd7be6fe036ca44e729d (patch) | |
| tree | e0310f3a4965dbe364639efb610d96eeca49ee19 /scripts | |
| parent | f5b86c0f11bc921647d1f677b62a14527bfb50c3 (diff) | |
| download | qtlocation-mapboxgl-bb931505c5f11c21a31cdd7be6fe036ca44e729d.tar.gz | |
[build] Remove Mason submodule in favor of CMake mason
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/clang-tools.sh | 6 | ||||
| -rwxr-xr-x | scripts/mason.sh | 3 | ||||
| -rwxr-xr-x | scripts/travis_setup.sh | 14 | ||||
| -rwxr-xr-x | scripts/valgrind.sh | 6 |
4 files changed, 13 insertions, 16 deletions
diff --git a/scripts/clang-tools.sh b/scripts/clang-tools.sh index ae3a5fa0e7..2a330a5ee4 100755 --- a/scripts/clang-tools.sh +++ b/scripts/clang-tools.sh @@ -3,10 +3,8 @@ set -e set -o pipefail -export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" - -CLANG_TIDY=${CLANG_TIDY:-$(mason prefix clang-tidy 3.9.1)/bin/clang-tidy} -CLANG_FORMAT=${CLANG_FORMAT:-$(mason prefix clang-format 3.9.1)/bin/clang-format} +CLANG_TIDY=${CLANG_TIDY:-$(scripts/mason.sh PREFIX clang-tidy VERSION 3.9.1)/bin/clang-tidy} +CLANG_FORMAT=${CLANG_FORMAT:-$(scripts/mason.sh PREFIX clang-format VERSION 3.9.1)/bin/clang-format} command -v ${CLANG_TIDY} >/dev/null 2>&1 || { echo "Can't find ${CLANG_TIDY} in PATH." diff --git a/scripts/mason.sh b/scripts/mason.sh new file mode 100755 index 0000000000..696ad26adb --- /dev/null +++ b/scripts/mason.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +cmake -P cmake/mason.cmake "$@" diff --git a/scripts/travis_setup.sh b/scripts/travis_setup.sh index cdf36be363..20688ab4ec 100755 --- a/scripts/travis_setup.sh +++ b/scripts/travis_setup.sh @@ -29,12 +29,6 @@ if [ -x $(which ${CXX}) ]; then ${CXX} --version fi -# Ensure mason is on the PATH -export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" - -mapbox_time "checkout_mason" \ -git submodule update --init .mason - # Touch package.json so that we are definitely going to run an npm update action mapbox_time "touch_package_json" \ touch package.json @@ -58,9 +52,11 @@ export -f mapbox_start_xvfb function mapbox_export_mesa_library_path { # Install and set up to load a more recent version of mesa mapbox_time "install_mesa" \ - mason install mesa 13.0.3 - export LD_LIBRARY_PATH="`mason prefix mesa 13.0.3`/lib:${LD_LIBRARY_PATH:-}" - export LIBGL_DRIVERS_PATH="`mason prefix mesa 13.0.3`/lib/dri" + scripts/mason.sh install mesa VERSION 13.0.4 + + MESA_PREFIX=`scripts/mason.sh PREFIX mesa VERSION 13.0.4` + export LD_LIBRARY_PATH="${MESA_PREFIX}/lib:${LD_LIBRARY_PATH:-}" + export LIBGL_DRIVERS_PATH="${MESA_PREFIX}/lib/dri" } export -f mapbox_export_mesa_library_path diff --git a/scripts/valgrind.sh b/scripts/valgrind.sh index c717fc2cb8..4eeb9c9785 100755 --- a/scripts/valgrind.sh +++ b/scripts/valgrind.sh @@ -3,7 +3,7 @@ set -e set -o pipefail -.mason/mason install valgrind 3.12.0 +VALGRIND_PREFIX=$(scripts/mason.sh PREFIX valgrind VERSION 3.12.0) PARAMS="\ --leak-check=full \ @@ -13,6 +13,6 @@ PARAMS="\ --gen-suppressions=all \ --suppressions=scripts/valgrind.sup" -export VALGRIND_LIB=$(.mason/mason prefix valgrind 3.12.0)/lib/valgrind +export VALGRIND_LIB=${VALGRIND_PREFIX}/lib/valgrind -$(.mason/mason prefix valgrind 3.12.0)/bin/valgrind $PARAMS $@ +${VALGRIND_PREFIX}/bin/valgrind $PARAMS $@ |