Compare commits

...

10 commits

Author SHA1 Message Date
Dane Springmeyer
f1cf081e4c try 3.9 and check for GLIBCXX symbols >= 3.4.20 2016-10-11 00:52:03 -04:00
Dane Springmeyer
321fd54b00 serial mason installs 2016-10-11 00:49:06 -04:00
Dane Springmeyer
262bea88d1 try libstdc++-4.8-dev 2016-10-11 00:49:06 -04:00
Dane Springmeyer
a557b38dcf try clang-3.5 2016-10-11 00:49:06 -04:00
Dane Springmeyer
12d367950d try clang-3.5 2016-10-11 00:49:06 -04:00
Dane Springmeyer
593c883048 try libstdc++-4.9-dev 2016-10-11 00:49:06 -04:00
Dane Springmeyer
79c86f5901 Add back the libstdc++ upgrade 2016-10-11 00:49:06 -04:00
Dane Springmeyer
1dc5158c62 get acces to llvm-3.9.0 packages 2016-10-11 00:49:05 -04:00
Dane Springmeyer
e233fd28f3 try without libstdc++-5-dev 2016-10-11 00:49:05 -04:00
Dane Springmeyer
2b4323b010 try building with clang 3.8.1 2016-10-11 00:49:05 -04:00
2 changed files with 36 additions and 46 deletions

View file

@ -25,19 +25,19 @@ matrix:
- os: linux - os: linux
sudo: false sudo: false
compiler: ": clang" compiler: ": clang"
env: JOBS=8 MASON_PUBLISH=true CXX="ccache clang++-3.8 -Qunused-arguments" CC="clang-3.8" TRIGGER=true env: JOBS=8 MASON_PUBLISH=true CXX="ccache clang++-3.9 -Qunused-arguments" CC="clang-3.9" TRIGGER=true
addons: addons:
apt: apt:
sources: [ 'ubuntu-toolchain-r-test'] sources: [ 'ubuntu-toolchain-r-test' ]
packages: [ 'libstdc++-5-dev', 'xutils-dev'] packages: [ 'libstdc++-4.8-dev' ]
- os: linux - os: linux
sudo: false sudo: false
compiler: ": clang-coverage" compiler: ": clang-coverage"
env: JOBS=8 COVERAGE=true CXX="ccache clang++-3.8 -Qunused-arguments" CC="clang-3.8" env: JOBS=8 COVERAGE=true CXX="ccache clang++-3.9 -Qunused-arguments" CC="clang-3.9"
addons: addons:
apt: apt:
sources: [ 'ubuntu-toolchain-r-test'] sources: [ 'ubuntu-toolchain-r-test' ]
packages: ['libstdc++-5-dev', 'xutils-dev' ] packages: [ 'libstdc++-4.8-dev' ]
- os: osx - os: osx
compiler: ": clang-osx" compiler: ": clang-osx"
# https://docs.travis-ci.com/user/languages/objective-c/#Supported-OS-X-iOS-SDK-versions # https://docs.travis-ci.com/user/languages/objective-c/#Supported-OS-X-iOS-SDK-versions
@ -76,13 +76,10 @@ install:
before_script: before_script:
- source bootstrap.sh - source bootstrap.sh
- | - mason install clang++ 3.9.0
if [[ $(uname -s) == 'Linux' ]]; then - export PATH=$(mason prefix clang++ 3.9.0)/bin:${PATH}
mason install clang 3.8.0 - which clang++
export PATH=$(mason prefix clang 3.8.0)/bin:${PATH} - export LLVM_COV="$(mason prefix clang++ 3.9.0)/bin/llvm-cov"
which clang++
export LLVM_COV="$(mason prefix clang 3.8.0)/bin/llvm-cov"
fi
- ccache --version - ccache --version
- ccache -p || true - ccache -p || true
- ccache --show-stats || true - ccache --show-stats || true
@ -98,6 +95,7 @@ script:
# (and might work) for the next build # (and might work) for the next build
- DURATION=2400 - DURATION=2400
- scripts/travis-command-wrapper.py -s "date" -i 120 --deadline=$(( $(date +%s) + ${DURATION} )) make - scripts/travis-command-wrapper.py -s "date" -i 120 --deadline=$(( $(date +%s) + ${DURATION} )) make
- nm src/libmapnik.* | grep "GLIBCXX_3.4.2[0-9]" | c++filt
- make test - make test
- enabled ${COVERAGE} coverage - enabled ${COVERAGE} coverage
- enabled ${BENCH} make bench - enabled ${BENCH} make bench

View file

@ -11,7 +11,7 @@ todo
- shrink icu data - shrink icu data
' '
MASON_VERSION="new-pkgs" MASON_VERSION="llvm-3.9.0-newpkgs"
function setup_mason() { function setup_mason() {
if [[ ! -d ./.mason ]]; then if [[ ! -d ./.mason ]]; then
@ -47,42 +47,34 @@ function install() {
ICU_VERSION="55.1" ICU_VERSION="55.1"
function install_mason_deps() { function install_mason_deps() {
FAIL=0 install ccache 3.3.0
install ccache 3.3.0 & install zlib system
install zlib system & install jpeg_turbo 1.5.0 libjpeg
install jpeg_turbo 1.5.0 libjpeg & install libpng 1.6.24 libpng
install libpng 1.6.24 libpng & install libtiff 4.0.6 libtiff
install libtiff 4.0.6 libtiff & install libpq 9.5.2
install libpq 9.5.2 & install sqlite 3.14.1 libsqlite3
install sqlite 3.14.1 libsqlite3 & install expat 2.2.0 libexpat
install expat 2.2.0 libexpat & install icu ${ICU_VERSION}
install icu ${ICU_VERSION} & install proj 4.9.2 libproj
install proj 4.9.2 libproj & install pixman 0.34.0 libpixman-1
install pixman 0.34.0 libpixman-1 & install cairo 1.14.6 libcairo
install cairo 1.14.6 libcairo & install protobuf 2.6.1
install protobuf 2.6.1 &
# technically protobuf is not a mapnik core dep, but installing # technically protobuf is not a mapnik core dep, but installing
# here by default helps make mapnik-vector-tile builds easier # here by default helps make mapnik-vector-tile builds easier
install webp 0.5.1 libwebp & install webp 0.5.1 libwebp
install gdal 2.1.1 libgdal & install gdal 2.1.1 libgdal
install boost 1.61.0 & install boost 1.61.0
install boost_libsystem 1.61.0 & install boost_libsystem 1.61.0
install boost_libfilesystem 1.61.0 & install boost_libfilesystem 1.61.0
install boost_libprogram_options 1.61.0 & install boost_libprogram_options 1.61.0
install boost_libregex_icu 1.61.0 & install boost_libregex_icu 1.61.0
# technically boost thread and python are not a core dep, but installing # technically boost thread and python are not a core dep, but installing
# here by default helps make python-mapnik builds easier # here by default helps make python-mapnik builds easier
install boost_libthread 1.61.0 & install boost_libthread 1.61.0
install boost_libpython 1.61.0 & install boost_libpython 1.61.0
install freetype 2.6.5 libfreetype & install freetype 2.6.5 libfreetype
install harfbuzz 1.3.0 libharfbuzz & install harfbuzz 1.3.0 libharfbuzz
for job in $(jobs -p)
do
wait $job || let "FAIL+=1"
done
if [[ "$FAIL" != "0" ]]; then
exit ${FAIL}
fi
} }
MASON_LINKED_ABS=$(pwd)/mason_packages/.link MASON_LINKED_ABS=$(pwd)/mason_packages/.link