diff options
author | artemp <artem@mapnik.org> | 2014-11-03 10:43:55 +0000 |
---|---|---|
committer | artemp <artem@mapnik.org> | 2014-11-03 10:43:55 +0000 |
commit | 4a5d4ea0aa823871b504a9189d08667daf91b63c (patch) | |
tree | a1d48291592dff3bdd0e73f4e0c163961d8c5336 /configure | |
parent | 318d08706fdf1ee8e32ed00c96d2e8506a9a9935 (diff) | |
parent | 551ff954a5e30c89c27f59a9848ba0a9be871adc (diff) | |
download | qtlocation-mapboxgl-4a5d4ea0aa823871b504a9189d08667daf91b63c.tar.gz |
Merge branch 'master' into nunicode
Conflicts:
configure
styles
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 42 |
1 files changed, 7 insertions, 35 deletions
@@ -2,52 +2,32 @@ set -e set -o pipefail -shopt -s expand_aliases CONFIG_FILE=${1:-config.gypi} +if [ `uname -s` = 'Darwin' ]; then + MASON_PLATFORM=${MASON_PLATFORM:-osx} +fi + function finish { >&2 echo -en "\033[0m"; } trap finish EXIT -# Install node -if [[ ! -d ~/.nvm ]]; then - git clone --depth 1 https://github.com/creationix/nvm.git ~/.nvm -fi -set +u -. ~/.nvm/nvm.sh -if [ ! `nvm use 0.10 > /dev/null; echo $?` = 0 ]; then - >&2 echo -en "\033[1m\033[32m* " - nvm install 0.10 - >&2 echo -en "\033[0m"; -else - >&2 echo -en "\033[1m\033[32m* " - nvm use 0.10 - >&2 echo -en "\033[0m"; -fi - # Install mason -if [[ ! -d ~/.mason ]]; then - >&2 echo -e "\033[1m\033[32m* Installing Mason\033[0m" - git clone https://github.com/mapbox/mason.git ~/.mason -fi -alias mason='~/.mason/mason' - +. ./scripts/local_mason.sh -case $MASON_PLATFORM in +case ${MASON_PLATFORM} in 'ios') SQLITE_VERSION=system - LIBPNG_VERSION=1.6.13 LIBUV_VERSION=0.10.28 ZLIB_VERSION=system BOOST_VERSION=system - NUNICODE_VERSION=1.4 ;; *) GLFW_VERSION=a21f2377 SQLITE_VERSION=system - LIBPNG_VERSION=system + LIBPNG_VERSION=1.6.13 LIBCURL_VERSION=system LIBUV_VERSION=0.10.28 ZLIB_VERSION=system @@ -58,14 +38,8 @@ esac function abort { >&2 echo -e "\033[1m\033[31m$1\033[0m"; exit 1; } -NODE=`which node || abort 'Cannot find node'` -NPM=`which npm || abort 'Cannot find npm'` PYTHON=`which python || abort 'Cannot find python'` ->&2 echo -en "\033[1m\033[32m* Using npm " ->&2 ${NPM} --version ->&2 echo -en "\033[0m"; - >&2 echo -en "\033[1m\033[32m* Using " >&2 ${PYTHON} --version >&2 echo -en "\033[0m"; @@ -86,8 +60,6 @@ CONFIG="# Do not edit. Generated by the configure script. 'libraries': [] }, 'variables': { - 'node': '${NODE}', - 'npm': '${NPM}', 'python': '${PYTHON}', " |