[build] Remove unused files, and cleanup directories

This commit is contained in:
Konstantin Käfer
2017-12-13 15:32:48 +01:00
parent 54c4b83312
commit 1dd5e405c1
30 changed files with 3 additions and 184 deletions

BIN
deps/ninja/ninja-linux vendored

Binary file not shown.

BIN
deps/ninja/ninja-macos vendored

Binary file not shown.

8
deps/run_gyp vendored
View File

@@ -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())

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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-----

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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-----

View File

@@ -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

View File

@@ -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.

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

View File

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

View File

Before

Width:  |  Height:  |  Size: 841 B

After

Width:  |  Height:  |  Size: 841 B

View File

@@ -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()

View File

@@ -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>

View File

@@ -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