Updates vendored mason to v0.4 for LLVM 3.9.1

third_party/mason/scripts/minjur/a2c9dc871369432c7978718834dac487c0591bd6/script.sh

@@ -44,6 +44,7 @@ function mason_compile {
     cd build
     CMAKE_PREFIX_PATH=${MASON_ROOT}/.link \
     cmake \
+        -DCMAKE_BUILD_TYPE=Release \
         -DOSMIUM_INCLUDE_DIR=${OSMIUM_INCLUDE_DIR} \
         ..
     make

third_party/mason/scripts/minjur/feac70472f46c3145b6bdf7a02fdc37777828318/script.sh

@@ -44,6 +44,7 @@ function mason_compile {
     cd build
     CMAKE_PREFIX_PATH=${MASON_ROOT}/.link \
     cmake \
+        -DCMAKE_BUILD_TYPE=Release \
         -DOSMIUM_INCLUDE_DIR=${OSMIUM_INCLUDE_DIR} \
         ..
     make

third_party/mason/scripts/minjur/latest/.travis.yml

@@ -1,29 +1,19 @@
-language: c
-
-sudo: false
-
-addons:
-  apt:
-    sources:
-     - ubuntu-toolchain-r-test
-     - llvm-toolchain-precise-3.7
-    packages:
-     - clang-3.7
+language: generic
 
 matrix:
   include:
     - os: osx
-      osx_image: xcode6
-      compiler: clang
-    - os: osx
-      osx_image: xcode7
+      osx_image: xcode8
       compiler: clang
     - os: linux
-      compiler: clang
-      env: CXX=clang++-3.7
+      sudo: false
+      addons:
+        apt:
+          sources:
+           - ubuntu-toolchain-r-test
+          packages:
+           - libstdc++-5-dev
 
 script:
 - ./mason build ${MASON_NAME} ${MASON_VERSION}
-
-after_success:
 - ./mason publish ${MASON_NAME} ${MASON_VERSION}

third_party/mason/scripts/minjur/latest/script.sh

@@ -16,27 +16,24 @@ function mason_load_source {
 }
 
 function mason_prepare_compile {
-    echo ${MASON_ROOT}/.build
-    cd ${MASON_ROOT}
-    OSMIUM_INCLUDE_DIR=${MASON_ROOT}/osmcode-libosmium-latest/include
-    curl --retry 3 -f -# -L "https://github.com/osmcode/libosmium/tarball/master" -o osmium.tar.gz
-    tar -xzf osmium.tar.gz
-    rm -rf osmcode-libosmium-latest
-    mv osmcode-libosmium-* osmcode-libosmium-latest
-
-    cd $(dirname ${MASON_ROOT})
-    ${MASON_DIR}/mason install cmake 3.2.2
-    ${MASON_DIR}/mason link cmake 3.2.2
-    ${MASON_DIR}/mason install boost 1.59.0
-    ${MASON_DIR}/mason link boost 1.59.0
-    ${MASON_DIR}/mason install boost_liball 1.59.0
-    ${MASON_DIR}/mason link boost_liball 1.59.0
+    ${MASON_DIR}/mason install cmake 3.6.2
+    ${MASON_DIR}/mason link cmake 3.6.2
+    ${MASON_DIR}/mason install utfcpp 2.3.4
+    ${MASON_DIR}/mason link utfcpp 2.3.4
+    ${MASON_DIR}/mason install protozero 1.4.5
+    ${MASON_DIR}/mason link protozero 1.4.5
+    ${MASON_DIR}/mason install rapidjson 2016-07-20-369de87
+    ${MASON_DIR}/mason link rapidjson 2016-07-20-369de87
+    ${MASON_DIR}/mason install libosmium 2.10.3
+    ${MASON_DIR}/mason link libosmium 2.10.3
+    ${MASON_DIR}/mason install boost 1.62.0
+    ${MASON_DIR}/mason link boost 1.62.0
     ${MASON_DIR}/mason install zlib 1.2.8
     ${MASON_DIR}/mason link zlib 1.2.8
-    ${MASON_DIR}/mason install expat 2.1.0
-    ${MASON_DIR}/mason link expat 2.1.0
-    ${MASON_DIR}/mason install bzip 1.0.6
-    ${MASON_DIR}/mason link bzip 1.0.6
+    ${MASON_DIR}/mason install expat 2.2.0
+    ${MASON_DIR}/mason link expat 2.2.0
+    ${MASON_DIR}/mason install bzip2 1.0.6
+    ${MASON_DIR}/mason link bzip2 1.0.6
 }
 
 function mason_compile {
@@ -45,15 +42,27 @@ function mason_compile {
     cd build
     CMAKE_PREFIX_PATH=${MASON_ROOT}/.link \
     ${MASON_ROOT}/.link/bin/cmake \
-        -DOSMIUM_INCLUDE_DIR=${OSMIUM_INCLUDE_DIR} \
+        -DCMAKE_BUILD_TYPE=Release \
         ..
-    make
+    make VERBOSE=1
     mkdir -p ${MASON_PREFIX}/bin
     mv minjur ${MASON_PREFIX}/bin/minjur
     mv minjur-mp ${MASON_PREFIX}/bin/minjur-mp
     mv minjur-generate-tilelist ${MASON_PREFIX}/bin/minjur-generate-tilelist
 }
 
+function mason_cflags {
+    :
+}
+
+function mason_ldflags {
+    :
+}
+
+function mason_static_libs {
+    :
+}
+
 function mason_clean {
     make clean
 }