use a local version of mason instead of writing into ~/.mason

fixes #526

.gitmodules

@@ -5,3 +5,6 @@
 [submodule "test/suite"]
 	path = test/suite
 	url = https://github.com/mapbox/mapbox-gl-test-suite.git
+[submodule ".mason"]
+	path = .mason
+	url = https://github.com/mapbox/mason.git

.travis.yml

@@ -25,9 +25,9 @@ env:
    - LD_LIBRARY_PATH: '/usr/local/lib'
 
 before_install:
+- source ./scripts/local_mason.sh
 - source ./scripts/travis_helper.sh
 - source ./scripts/flags.sh
-- (git clone https://github.com/mapbox/mason.git ~/.mason ; sudo ln -s ~/.mason/mason /usr/local/bin/mason)
 - ./scripts/travis_before_install.sh
 - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then export LD_LIBRARY_PATH=`mason prefix mesa 10.3.1`/lib; fi
 - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then glxinfo; fi

configure

@@ -2,7 +2,6 @@
 
 set -e
 set -o pipefail
-shopt -s expand_aliases
 
 CONFIG_FILE=${1:-config.gypi}
 
@@ -16,11 +15,7 @@ function finish {
 trap finish EXIT
 
 # 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
     'ios')

scripts/local_mason.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+shopt -s expand_aliases
+
+git submodule update --init .mason
+
+alias mason=`pwd`/.mason/mason
+export MASON_DIR=`pwd`/.mason