Merge commit 'f8dd96543542220181c76afb8c084f4908213fb5' as 'third_party/mason'

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

@@ -0,0 +1,21 @@
+language: cpp
+
+sudo: false
+
+matrix:
+  include:
+    - os: osx
+      osx_image: xcode6
+      compiler: clang
+    - os: osx
+      osx_image: xcode7
+      compiler: clang
+    - os: linux
+      compiler: clang
+
+script:
+- if [[ $(uname -s) == 'Darwin' ]]; then brew install cmake; fi
+- ./mason build ${MASON_NAME} ${MASON_VERSION}
+
+after_success:
+- ./mason publish ${MASON_NAME} ${MASON_VERSION}

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

@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+
+MASON_NAME=minjur
+MASON_VERSION=a2c9dc871369432c7978718834dac487c0591bd6
+
+. ${MASON_DIR}/mason.sh
+
+function mason_load_source {
+    mason_download \
+        https://github.com/mapbox/minjur/tarball/a2c9dc871369432c7978718834dac487c0591bd6 \
+        b24a45f64ae0b75e2fbcbb6b87e04192b63b3014
+
+    mason_extract_tar_gz
+
+    export MASON_BUILD_PATH=${MASON_ROOT}/.build/mapbox-minjur-a2c9dc8
+}
+
+function mason_prepare_compile {
+    echo ${MASON_ROOT}/.build
+    cd ${MASON_ROOT}
+    OSMIUM_INCLUDE_DIR=${MASON_ROOT}/osmcode-libosmium-372d29a/include
+    curl --retry 3 -f -# -L "https://github.com/osmcode/libosmium/tarball/372d29a34d8b3f571ea7172d527730d3d5200dab" -o osmium.tar.gz
+    tar -xzf osmium.tar.gz
+
+    cd $(dirname ${MASON_ROOT})
+    ${MASON_DIR}/mason install boost 1.57.0
+    ${MASON_DIR}/mason link boost 1.57.0
+    ${MASON_DIR}/mason install boost_libprogram_options 1.57.0
+    ${MASON_DIR}/mason link boost_libprogram_options 1.57.0
+    ${MASON_DIR}/mason install protobuf 2.6.1
+    ${MASON_DIR}/mason link protobuf 2.6.1
+    ${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 osmpbf 1.3.3
+    ${MASON_DIR}/mason link osmpbf 1.3.3
+    ${MASON_DIR}/mason install bzip 1.0.6
+    ${MASON_DIR}/mason link bzip 1.0.6
+}
+
+function mason_compile {
+    mkdir build
+    cd build
+    CMAKE_PREFIX_PATH=${MASON_ROOT}/.link \
+    cmake \
+        -DOSMIUM_INCLUDE_DIR=${OSMIUM_INCLUDE_DIR} \
+        ..
+    make
+    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_clean {
+    make clean
+}
+
+mason_run "$@"

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

@@ -0,0 +1,16 @@
+language: cpp
+
+sudo: false
+
+matrix:
+  include:
+    - os: osx
+      compiler: clang
+    - os: linux
+      compiler: clang
+
+script:
+- ./mason build ${MASON_NAME} ${MASON_VERSION}
+
+after_success:
+- ./mason publish ${MASON_NAME} ${MASON_VERSION}

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

@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+
+MASON_NAME=minjur
+MASON_VERSION=feac70472f46c3145b6bdf7a02fdc37777828318
+
+. ${MASON_DIR}/mason.sh
+
+function mason_load_source {
+    mason_download \
+        https://github.com/mapbox/minjur/tarball/feac70472f46c3145b6bdf7a02fdc37777828318 \
+        4af6719285ab68ad99ba35e441b925cc950a1a27
+
+    mason_extract_tar_gz
+
+    export MASON_BUILD_PATH=${MASON_ROOT}/.build/mapbox-minjur-feac704
+}
+
+function mason_prepare_compile {
+    echo ${MASON_ROOT}/.build
+    cd ${MASON_ROOT}
+    OSMIUM_INCLUDE_DIR=${MASON_ROOT}/osmcode-libosmium-372d29a/include
+    curl --retry 3 -f -# -L "https://github.com/osmcode/libosmium/tarball/372d29a34d8b3f571ea7172d527730d3d5200dab" -o osmium.tar.gz
+    tar -xzf osmium.tar.gz
+
+    cd $(dirname ${MASON_ROOT})
+    ${MASON_DIR}/mason install boost 1.57.0
+    ${MASON_DIR}/mason link boost 1.57.0
+    ${MASON_DIR}/mason install boost_libprogram_options 1.57.0
+    ${MASON_DIR}/mason link boost_libprogram_options 1.57.0
+    ${MASON_DIR}/mason install protobuf 2.6.1
+    ${MASON_DIR}/mason link protobuf 2.6.1
+    ${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 osmpbf 1.3.3
+    ${MASON_DIR}/mason link osmpbf 1.3.3
+    ${MASON_DIR}/mason install bzip 1.0.6
+    ${MASON_DIR}/mason link bzip 1.0.6
+}
+
+function mason_compile {
+    mkdir build
+    cd build
+    CMAKE_PREFIX_PATH=${MASON_ROOT}/.link \
+    cmake \
+        -DOSMIUM_INCLUDE_DIR=${OSMIUM_INCLUDE_DIR} \
+        ..
+    make
+    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_clean {
+    make clean
+}
+
+mason_run "$@"

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

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

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

@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+
+MASON_NAME=minjur
+MASON_VERSION=latest
+MASON_LIB_FILE=bin/minjur
+
+. ${MASON_DIR}/mason.sh
+
+function mason_load_source {
+    export MASON_BUILD_PATH=${MASON_ROOT}/.build/minjur-latest
+    if [[ ! -d ${MASON_BUILD_PATH} ]]; then
+        git clone --depth 1 https://github.com/mapbox/minjur.git ${MASON_BUILD_PATH}
+    else
+        (cd ${MASON_BUILD_PATH} && git pull)
+    fi
+}
+
+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 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
+}
+
+function mason_compile {
+    rm -rf build
+    mkdir -p build
+    cd build
+    CMAKE_PREFIX_PATH=${MASON_ROOT}/.link \
+    ${MASON_ROOT}/.link/bin/cmake \
+        -DOSMIUM_INCLUDE_DIR=${OSMIUM_INCLUDE_DIR} \
+        ..
+    make
+    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_clean {
+    make clean
+}
+
+mason_run "$@"