diff options
-rwxr-xr-x | deps/ninja/ninja-linux | bin | 166960 -> 0 bytes | |||
-rwxr-xr-x | deps/ninja/ninja-macos | bin | 171356 -> 0 bytes | |||
-rwxr-xr-x | deps/run_gyp | 8 | ||||
-rw-r--r-- | docker/Dockerfile | 16 | ||||
-rw-r--r-- | docker/bitrise/android/Dockerfile | 21 | ||||
-rwxr-xr-x | docker/build.sh | 8 | ||||
-rw-r--r-- | docker/clang-tidy/Dockerfile | 9 | ||||
-rwxr-xr-x | docker/clang-tidy/run.sh | 14 | ||||
-rwxr-xr-x | docker/clang-tidy/tidy.sh | 18 | ||||
-rw-r--r-- | docker/george-edison55-precise-backports.gpg.key | 13 | ||||
-rw-r--r-- | docker/george-edison55-precise-backports.list | 2 | ||||
-rw-r--r-- | docker/linux/Dockerfile | 14 | ||||
-rwxr-xr-x | docker/linux/run.sh | 14 | ||||
-rwxr-xr-x | docker/linux/test.sh | 24 | ||||
-rw-r--r-- | docker/ubuntu-toolchain-r.gpg.key | 13 | ||||
-rw-r--r-- | docker/ubuntu-toolchain-r.list | 2 | ||||
-rw-r--r-- | docs/TROUBLESHOOTING.md | 5 | ||||
-rw-r--r-- | misc/bench-icon.svg (renamed from common/bench-icon.svg) | 0 | ||||
-rw-r--r-- | misc/ca-bundle.crt (renamed from common/ca-bundle.crt) | 0 | ||||
-rw-r--r-- | misc/cloudformation.template (renamed from cloudformation/travis.template) | 0 | ||||
-rw-r--r-- | misc/mb-icon-blue-circle.svg (renamed from common/mb-icon-blue-circle.svg) | 0 | ||||
-rw-r--r-- | misc/mb-icon-blue-square.png (renamed from common/mb-icon-blue-square.png) | bin | 35662 -> 35662 bytes | |||
-rw-r--r-- | misc/mb-icon-blue-square.svg (renamed from common/mb-icon-blue-square.svg) | 0 | ||||
-rw-r--r-- | misc/proto/binary_program.proto (renamed from proto/binary_program.proto) | 0 | ||||
-rw-r--r-- | misc/proto/glyphs.proto (renamed from proto/glyphs.proto) | 0 | ||||
-rw-r--r-- | misc/proto/style.proto (renamed from proto/style.proto) | 0 | ||||
-rw-r--r-- | misc/proto/vector_tile.proto (renamed from proto/vector_tile.proto) | 0 | ||||
-rw-r--r-- | platform/linux/config.cmake | 2 | ||||
-rw-r--r-- | platform/qt/resources/common.qrc | 2 | ||||
-rwxr-xr-x | scripts/update_ca_bundle.sh | 2 |
30 files changed, 3 insertions, 184 deletions
diff --git a/deps/ninja/ninja-linux b/deps/ninja/ninja-linux Binary files differdeleted file mode 100755 index e4a6202d99..0000000000 --- a/deps/ninja/ninja-linux +++ /dev/null diff --git a/deps/ninja/ninja-macos b/deps/ninja/ninja-macos Binary files differdeleted file mode 100755 index 64fcacc550..0000000000 --- a/deps/ninja/ninja-macos +++ /dev/null diff --git a/deps/run_gyp b/deps/run_gyp deleted file mode 100755 index f25d50a5dd..0000000000 --- a/deps/run_gyp +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env python -import sys -import os.path -sys.path.insert(1, os.path.join(os.path.dirname(sys.argv[0]), 'gyp', 'pylib')) -import gyp - -if __name__ == '__main__': - sys.exit(gyp.script_main()) diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index 64f1ca3c87..0000000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM ubuntu:12.04 - -ENV DEBIAN_FRONTEND noninteractive - -# Add other APT sources and keys -ADD *.list /etc/apt/sources.list.d/ -ADD *.gpg.key /tmp/ -RUN find /tmp/*.gpg.key | xargs -n1 apt-key add - -# Recreate Travis CI environment -RUN apt-get update -y -RUN apt-get install -y git-core python-pip curl automake libtool make cmake pkg-config python-pip \ - libc6 libstdc++6 zlib1g-dev libcurl4-openssl-dev libpng-dev libsqlite3-dev \ - xvfb libglu1-mesa-dev libxrandr-dev libxinerama-dev libxi-dev libxcursor-dev xutils-dev \ - mesa-utils libxxf86vm-dev x11proto-xf86vidmode-dev cmake && \ - pip install awscli diff --git a/docker/bitrise/android/Dockerfile b/docker/bitrise/android/Dockerfile deleted file mode 100644 index 264fa01b98..0000000000 --- a/docker/bitrise/android/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM bitriseio/android-ndk:latest - -# Install Google Cloud SDK for Firebase -RUN set -eu && \ - (echo "deb http://packages.cloud.google.com/apt cloud-sdk-$(lsb_release -c -s) main" | sudo tee /etc/apt/sources.list.d/google-cloud-sdk.list) && \ - (curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add -) && \ - sudo apt-get update && \ - sudo apt-get install -y google-cloud-sdk python-dev python-setuptools ccache && \ - sudo apt-get clean && \ - sudo easy_install -U pip && \ - pip install --no-cache-dir awscli && \ - mkdir -p "${ANDROID_HOME}/licenses" && \ - (echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > "${ANDROID_HOME}/licenses/android-sdk-license") - -RUN set -eu && \ - git clone --depth=1 "https://github.com/mapbox/mapbox-gl-native.git" . && \ - ccache -z && \ - BUILDTYPE=Debug make android-test-lib-arm-v7 && \ - BUILDTYPE=Debug make android-checkstyle && \ - ccache -s && \ - cd .. && rm -rf src && mkdir src diff --git a/docker/build.sh b/docker/build.sh deleted file mode 100755 index c6eb1b110d..0000000000 --- a/docker/build.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -#!/usr/bin/env bash - -set -e -set -o pipefail - -docker build -t mapbox/gl-native:travis docker diff --git a/docker/clang-tidy/Dockerfile b/docker/clang-tidy/Dockerfile deleted file mode 100644 index c880391592..0000000000 --- a/docker/clang-tidy/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM mapbox/gl-native:travis - -# Install compiler -RUN apt-get -y install clang-3.8 lldb-3.8 clang-tidy-3.8 clang-format-3.8 - -RUN useradd -ms /bin/bash mapbox -USER mapbox -ENV HOME /home/mapbox -WORKDIR /home/mapbox diff --git a/docker/clang-tidy/run.sh b/docker/clang-tidy/run.sh deleted file mode 100755 index 421aca9700..0000000000 --- a/docker/clang-tidy/run.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail - -./docker/build.sh - -docker build -t mapbox/gl-native:clang-tidy docker/clang-tidy - -docker run \ - -i \ - -v `pwd`:/home/mapbox/build \ - -t mapbox/gl-native:clang-tidy \ - build/docker/clang-tidy/tidy.sh diff --git a/docker/clang-tidy/tidy.sh b/docker/clang-tidy/tidy.sh deleted file mode 100755 index 4c1b74595a..0000000000 --- a/docker/clang-tidy/tidy.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash - -# set -e -# set -o pipefail - -export CXX=clang++-3.8 -export BUILDTYPE=Release - -cd build - -# before_install -source ./scripts/travis_helper.sh - -# install -./platform/linux/scripts/install.sh - -export CLANG_TIDY=clang-tidy-3.8 -make tidy diff --git a/docker/george-edison55-precise-backports.gpg.key b/docker/george-edison55-precise-backports.gpg.key deleted file mode 100644 index 69971cfce8..0000000000 --- a/docker/george-edison55-precise-backports.gpg.key +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.5 -Comment: Hostname: keyserver.ubuntu.com - -mI0ETFYUegEEAMF062ZPYWxX0blpJpLCz/oEXwvxJoQg1Sz4uD4Fs1FCfRwHMlydwbGvEjEr -QG39OXf1y1+lGVI73BLcuDd/n0yBLN9brycDspZKnQ25VaRB6sl8EDR8XM5tiA/diW1EIygS -Ad/NuwXv236e+1E+zvik6faeoxygJbbj0KN67Hx7ABEBAAG0HUxhdW5jaHBhZCBHZW9yZ2Ug -RWRpc29uJ3MgUFBBiLYEEwECACAFAkxWFHoCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAK -CRAITs/Fgoq3JpJ0A/9RquDizs5oUhyqqT4t4EHEIH9+ckl/3cQj0peN5APA5TOqAS4iVxic -GO3YB7yY4a+v5qQUalOMNAQRUigi3IwCcOSs94Bt5f7lK6xbU7mIO2D5a7cUCjN36FXe+oWp -4s5odz5+9OZrIVzJw/NOdgneLqh2ts5jWGYmOg7POJk9mQ== -=ItbQ ------END PGP PUBLIC KEY BLOCK----- diff --git a/docker/george-edison55-precise-backports.list b/docker/george-edison55-precise-backports.list deleted file mode 100644 index 2bae784dd6..0000000000 --- a/docker/george-edison55-precise-backports.list +++ /dev/null @@ -1,2 +0,0 @@ -deb http://ppa.launchpad.net/george-edison55/precise-backports/ubuntu precise main -deb-src http://ppa.launchpad.net/george-edison55/precise-backports/ubuntu precise main diff --git a/docker/linux/Dockerfile b/docker/linux/Dockerfile deleted file mode 100644 index c797082d93..0000000000 --- a/docker/linux/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM mapbox/gl-native:travis - -# Install compiler -RUN apt-get -y install gdb g++-5 gcc-5 libllvm3.4 - -RUN useradd -ms /bin/bash mapbox -USER mapbox -ENV HOME /home/mapbox -WORKDIR /home/mapbox - -# Node -RUN git clone https://github.com/creationix/nvm.git ~/.nvm && \ - . ~/.nvm/nvm.sh && \ - NVM_DIR=~/.nvm nvm install 4.4.5 diff --git a/docker/linux/run.sh b/docker/linux/run.sh deleted file mode 100755 index 3d41843cf2..0000000000 --- a/docker/linux/run.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail - -./docker/build.sh - -docker build -t mapbox/gl-native:linux docker/linux - -docker run \ - -i \ - -v `pwd`:/home/mapbox/build \ - -t mapbox/gl-native:linux \ - build/docker/linux/test.sh diff --git a/docker/linux/test.sh b/docker/linux/test.sh deleted file mode 100755 index 207f7679cf..0000000000 --- a/docker/linux/test.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -# set -e -# set -o pipefail - -export _CXX=g++-5 -export _CC=gcc-5 -export BUILDTYPE=Release - -# Node -. ~/.nvm/nvm.sh -nvm use 4.4.5 - -# Xvfb -start-stop-daemon --start --pidfile ~/xvfb.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1024x768x24 -ac +extension GLX +render -noreset - -cd build - -# before_install -source ./scripts/travis_helper.sh -source ./scripts/travis_setup.sh - -make linux -make test diff --git a/docker/ubuntu-toolchain-r.gpg.key b/docker/ubuntu-toolchain-r.gpg.key deleted file mode 100644 index 854eef8520..0000000000 --- a/docker/ubuntu-toolchain-r.gpg.key +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.5 -Comment: Hostname: keyserver.ubuntu.com - -mI0ESuBvRwEEAMi4cDba7xlKaaoXjO1n1HX8RKrkW+HEIl79nSOSJyvzysajs7zUow/OzCQp -9NswqrDmNuH1+lPTTRNAGtK8r2ouq2rnXT1mTl23dpgHZ9spseR73s4ZBGw/ag4bpU5dNUSt -vfmHhIjVCuiSpNn7cyy1JSSvSs3N2mxteKjXLBf7ABEBAAG0GkxhdW5jaHBhZCBUb29sY2hh -aW4gYnVpbGRziLYEEwECACAFAkrgb0cCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAe -k3eiup7yfzGKA/4xzUqNACSlB+k+DxFFHqkwKa/ziFiAlkLQyyhm+iqz80htRZr7Ls/ZRYZl -0aSU56/hLe0V+TviJ1s8qdN2lamkKdXIAFfavA04nOnTzyIBJ82EAUT3Nh45skMxo4z4iZMN -msyaQpNl/m/lNtOLhR64v5ZybofB2EWkMxUzX8D/FQ== -=LcUQ ------END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file diff --git a/docker/ubuntu-toolchain-r.list b/docker/ubuntu-toolchain-r.list deleted file mode 100644 index 741f4528e2..0000000000 --- a/docker/ubuntu-toolchain-r.list +++ /dev/null @@ -1,2 +0,0 @@ -deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu precise main -deb-src http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu precise main
\ No newline at end of file diff --git a/docs/TROUBLESHOOTING.md b/docs/TROUBLESHOOTING.md deleted file mode 100644 index 9832b5da0a..0000000000 --- a/docs/TROUBLESHOOTING.md +++ /dev/null @@ -1,5 +0,0 @@ -# Troubleshooting - -To trigger a complete rebuild, run `make clean`. - -If you are having trouble getting the dependencies right, you can blow away the `mason_packages` directory, or run `make distclean`. This means the `Makefile` and configure script will automatically install the dependencies again on the next try. diff --git a/common/bench-icon.svg b/misc/bench-icon.svg index 28df6f600d..28df6f600d 100644 --- a/common/bench-icon.svg +++ b/misc/bench-icon.svg diff --git a/common/ca-bundle.crt b/misc/ca-bundle.crt index 6fd701b72c..6fd701b72c 100644 --- a/common/ca-bundle.crt +++ b/misc/ca-bundle.crt diff --git a/cloudformation/travis.template b/misc/cloudformation.template index db4e59eb7e..db4e59eb7e 100644 --- a/cloudformation/travis.template +++ b/misc/cloudformation.template diff --git a/common/mb-icon-blue-circle.svg b/misc/mb-icon-blue-circle.svg index 93f8c86a50..93f8c86a50 100644 --- a/common/mb-icon-blue-circle.svg +++ b/misc/mb-icon-blue-circle.svg diff --git a/common/mb-icon-blue-square.png b/misc/mb-icon-blue-square.png Binary files differindex 0a9bc1cdea..0a9bc1cdea 100644 --- a/common/mb-icon-blue-square.png +++ b/misc/mb-icon-blue-square.png diff --git a/common/mb-icon-blue-square.svg b/misc/mb-icon-blue-square.svg index de531b179b..de531b179b 100644 --- a/common/mb-icon-blue-square.svg +++ b/misc/mb-icon-blue-square.svg diff --git a/proto/binary_program.proto b/misc/proto/binary_program.proto index 9d06a209c3..9d06a209c3 100644 --- a/proto/binary_program.proto +++ b/misc/proto/binary_program.proto diff --git a/proto/glyphs.proto b/misc/proto/glyphs.proto index 6930b47a2b..6930b47a2b 100644 --- a/proto/glyphs.proto +++ b/misc/proto/glyphs.proto diff --git a/proto/style.proto b/misc/proto/style.proto index 90e5b65061..90e5b65061 100644 --- a/proto/style.proto +++ b/misc/proto/style.proto diff --git a/proto/vector_tile.proto b/misc/proto/vector_tile.proto index 1cde2c7aa9..1cde2c7aa9 100644 --- a/proto/vector_tile.proto +++ b/misc/proto/vector_tile.proto diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index 6de571e88b..dd5f0af112 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -115,7 +115,7 @@ macro(mbgl_platform_glfw) add_custom_command( TARGET mbgl-glfw POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_SOURCE_DIR}/common/ca-bundle.crt + ${CMAKE_SOURCE_DIR}/misc/ca-bundle.crt ${CMAKE_CURRENT_BINARY_DIR}/ca-bundle.crt ) endmacro() diff --git a/platform/qt/resources/common.qrc b/platform/qt/resources/common.qrc index 598059d55e..24f663df77 100644 --- a/platform/qt/resources/common.qrc +++ b/platform/qt/resources/common.qrc @@ -1,6 +1,6 @@ <RCC> <qresource prefix="/"> - <file alias="icon.png">../../../common/mb-icon-blue-square.png</file> + <file alias="icon.png">../../../misc/mb-icon-blue-square.png</file> <file alias="default_marker.svg">../../../platform/default/resources/default_marker.svg</file> <file>source1.geojson</file> <file>source2.geojson</file> diff --git a/scripts/update_ca_bundle.sh b/scripts/update_ca_bundle.sh index 992bd7030f..3bd268bd0c 100755 --- a/scripts/update_ca_bundle.sh +++ b/scripts/update_ca_bundle.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -cd common +cd misc curl https://raw.githubusercontent.com/curl/curl/master/lib/mk-ca-bundle.pl | perl rm certdata.txt |