ExternalVendorCode/tippecanoe
1
0
Fork 0
mirror of https://github.com/mapbox/tippecanoe.git synced 2025-04-16 23:19:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[tippecanoe] Added missing dependency for libdeflate

Browse Source
This commit is contained in:
Ilia Platone 2018-12-24 18:14:53 +01:00
parent cdf5322e9a
commit abd3e0f623
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.travis.yml
View File

@ -13,7 +13,7 @@ matrix:
- docker
sudo: true
dist: trusty
env: LD_LIBRARY_PATH=${TRAVIS_BUILD_DIR}/libdeflate DOCKERFILE=Dockerfile.centos7
env: DOCKERFILE=Dockerfile.centos7
before_install: []
install:
- docker build -t tippecanoe-image -f ${DOCKERFILE} .
@ -26,7 +26,7 @@ matrix:
- docker
sudo: true
dist: trusty
env: LD_LIBRARY_PATH=${TRAVIS_BUILD_DIR}/libdeflate DOCKERFILE=Dockerfile
env: DOCKERFILE=Dockerfile
before_install: []
install:
- docker build -t tippecanoe-image -f ${DOCKERFILE} .
@ -35,7 +35,7 @@ matrix:
# debug+integer-santizer build
- os: linux
compiler: clang
env: LD_LIBRARY_PATH=${TRAVIS_BUILD_DIR}/libdeflate CLANG_VERSION='3.8.0' BUILDTYPE=Debug CC="clang-3.8" CXX="clang++-3.8" CXXFLAGS="-fsanitize=integer" CFLAGS="-fsanitize=integer" LDFLAGS="-fsanitize=integer"
env: CLANG_VERSION='3.8.0' BUILDTYPE=Debug CC="clang-3.8" CXX="clang++-3.8" CXXFLAGS="-fsanitize=integer" CFLAGS="-fsanitize=integer" LDFLAGS="-fsanitize=integer"
addons:
apt:
sources: ['ubuntu-toolchain-r-test' ]
@ -43,7 +43,7 @@ matrix:
# debug+leak+address-sanitizer build
- os: linux
compiler: clang
env: LD_LIBRARY_PATH=${TRAVIS_BUILD_DIR}/libdeflate CLANG_VERSION='3.8.0' BUILDTYPE=Debug ASAN_OPTIONS=detect_leaks=1 CC="clang-3.8" CXX="clang++-3.8" CXXFLAGS="-fsanitize=address,undefined" CFLAGS="-fsanitize=address,undefined" LDFLAGS="-fsanitize=address,undefined" FEWER=true
env: CLANG_VERSION='3.8.0' BUILDTYPE=Debug ASAN_OPTIONS=detect_leaks=1 CC="clang-3.8" CXX="clang++-3.8" CXXFLAGS="-fsanitize=address,undefined" CFLAGS="-fsanitize=address,undefined" LDFLAGS="-fsanitize=address,undefined" FEWER=true
addons:
apt:
sources: ['ubuntu-toolchain-r-test' ]
@ -51,7 +51,7 @@ matrix:
# coverage+debug build
- os: linux
compiler: clang
env: LD_LIBRARY_PATH=${TRAVIS_BUILD_DIR}/libdeflate CLANG_VERSION='3.8.0' BUILDTYPE=Debug CC="clang-3.8" CXX="clang++-3.8" CXXFLAGS="--coverage" CFLAGS="--coverage" LDFLAGS="--coverage"
env: CLANG_VERSION='3.8.0' BUILDTYPE=Debug CC="clang-3.8" CXX="clang++-3.8" CXXFLAGS="--coverage" CFLAGS="--coverage" LDFLAGS="--coverage"
after_script:
- mason install llvm-cov 3.9.1
- mason link llvm-cov 3.9.1
@ -66,7 +66,7 @@ matrix:
# release+linux+g++
- os: linux
compiler: gcc
env: LD_LIBRARY_PATH=${TRAVIS_BUILD_DIR}/libdeflate BUILDTYPE=Release CC="gcc-4.9" CXX="g++-4.9"
env: BUILDTYPE=Release CC="gcc-4.9" CXX="g++-4.9"
addons:
apt:
sources: ['ubuntu-toolchain-r-test']
@ -74,7 +74,7 @@ matrix:
# release+linux+clang++
- os: linux
compiler: clang
env: LD_LIBRARY_PATH=${TRAVIS_BUILD_DIR}/libdeflate CLANG_VERSION='3.8.0' BUILDTYPE=Release CC="clang-3.8" CXX="clang++-3.8"
env: CLANG_VERSION='3.8.0' BUILDTYPE=Release CC="clang-3.8" CXX="clang++-3.8"
addons:
apt:
sources: ['ubuntu-toolchain-r-test' ]
@ -82,11 +82,11 @@ matrix:
# release+osx
- os: osx
compiler: clang
env: LD_LIBRARY_PATH=${TRAVIS_BUILD_DIR}/libdeflate BUILDTYPE=Release
env: BUILDTYPE=Release
# debug+osx
- os: osx
compiler: clang
env: LD_LIBRARY_PATH=${TRAVIS_BUILD_DIR}/libdeflate BUILDTYPE=Debug
env: BUILDTYPE=Debug
before_install:
- DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"

4
Makefile
View File

@ -23,7 +23,7 @@ all: deflate tippecanoe tippecanoe-enumerate tippecanoe-decode tile-join unit ti
docs: man/tippecanoe.1
install: tippecanoe tippecanoe-enumerate tippecanoe-decode tile-join tippecanoe-json-tool
install: deflate tippecanoe tippecanoe-enumerate tippecanoe-decode tile-join tippecanoe-json-tool
mkdir -p $(PREFIX)/bin
mkdir -p $(MANDIR)
cp tippecanoe $(PREFIX)/bin/tippecanoe
@ -342,7 +342,7 @@ tests/%.json: Makefile tippecanoe tippecanoe-decode
cmp $(patsubst %.check,%,$@) $@
rm $@.check.mbtiles
deflate:
deflate: deflate-clean
cd libdeflate && make BUILDTYPE=$(BUILDTYPE) libdeflate.a
deflate-clean: