Skip to content

Commit d317722

Browse files
Dane Springmeyerartemp
authored andcommitted
attempt to build against mapnik 3.0.13 mason package
1 parent b248758 commit d317722

3 files changed

Lines changed: 29 additions & 44 deletions

File tree

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ matrix:
1515
# note: only using ccache for CC is intentional here to
1616
# workaround an odd bug in distutils that manifests when only `ccache` is used to link
1717
# because distutils also has a bug whereby CC is used to compile instead of CXX, this works :)
18-
env: JOBS=8 CXX="clang++-3.8 -Qunused-arguments" CC="ccache clang-3.8"
18+
env: JOBS=8 CXX="clang++-3.9 -Qunused-arguments" CC="ccache clang-3.9"
1919
addons:
2020
apt:
2121
sources: [ 'ubuntu-toolchain-r-test']
@@ -55,9 +55,9 @@ before_install:
5555
- export COMMIT_MESSAGE=$(git show -s --format=%B $TRAVIS_COMMIT | tr -d '\n')
5656
- |
5757
if [[ $(uname -s) == 'Linux' ]]; then
58-
export LDSHARED=$(python -c "import os;from distutils import sysconfig;print sysconfig.get_config_var('LDSHARED').replace('cc ','clang++-3.8 ')");
59-
./.mason/mason install clang 3.8.0
60-
export PATH=$(./.mason/mason prefix clang 3.8.0)/bin:${PATH}
58+
export LDSHARED=$(python -c "import os;from distutils import sysconfig;print sysconfig.get_config_var('LDSHARED').replace('cc ','clang++-3.9 ')");
59+
./.mason/mason install clang++ 3.9.1
60+
export PATH=$(./.mason/mason prefix clang++ 3.9.1)/bin:${PATH}
6161
which clang++
6262
else
6363
sudo easy_install pip;

bootstrap.sh

Lines changed: 24 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -7,51 +7,36 @@ function install() {
77
MASON_PLATFORM_ID=$(mason env MASON_PLATFORM_ID)
88
if [[ ! -d ./mason_packages/${MASON_PLATFORM_ID}/${1}/ ]]; then
99
mason install $1 $2
10-
# the rm here is to workaround https://github.com/mapbox/mason/issues/230
11-
rm -f ./mason_packages/.link/mason.ini
1210
mason link $1 $2
1311
fi
1412
}
1513

16-
ICU_VERSION="55.1"
14+
ICU_VERSION="57.1"
1715

1816
function install_mason_deps() {
19-
FAIL=0
20-
install mapnik latest &
21-
install ccache 3.2.4 &
22-
install jpeg_turbo 1.5.0 libjpeg &
23-
install libpng 1.6.24 libpng &
24-
install libtiff 4.0.6 libtiff &
25-
install libpq 9.5.2 &
26-
install sqlite 3.14.1 libsqlite3 &
27-
install expat 2.2.0 libexpat &
28-
install icu ${ICU_VERSION} &
29-
install proj 4.9.2 libproj &
30-
install pixman 0.34.0 libpixman-1 &
31-
install cairo 1.14.6 libcairo &
32-
install protobuf 2.6.1 &
33-
# technically protobuf is not a mapnik core dep, but installing
34-
# here by default helps make mapnik-vector-tile builds easier
35-
install webp 0.5.1 libwebp &
36-
install gdal 2.1.1 libgdal &
37-
install boost 1.61.0 &
38-
install boost_libsystem 1.61.0 &
39-
install boost_libfilesystem 1.61.0 &
40-
install boost_libprogram_options 1.61.0 &
41-
install boost_libregex_icu 1.61.0 &
42-
# technically boost thread and python are not a core dep, but installing
43-
# here by default helps make python-mapnik builds easier
44-
install boost_libthread 1.61.0 &
45-
install boost_libpython 1.61.0 &
46-
install freetype 2.6.5 libfreetype &
47-
install harfbuzz 1.3.0 libharfbuzz &
48-
for job in $(jobs -p)
49-
do
50-
wait $job || let "FAIL+=1"
51-
done
52-
if [[ "$FAIL" != "0" ]]; then
53-
exit ${FAIL}
54-
fi
17+
install mapnik 3.0.13
18+
install jpeg_turbo 1.5.1 libjpeg
19+
install libpng 1.6.28 libpng
20+
install libtiff 4.0.7 libtiff
21+
install libpq 9.6.2
22+
install sqlite 3.17.0 libsqlite3
23+
install expat 2.2.0 libexpat
24+
install icu ${ICU_VERSION}
25+
install proj 4.9.3 libproj
26+
install pixman 0.34.0 libpixman-1
27+
install cairo 1.14.8 libcairo
28+
install webp 0.6.0 libwebp
29+
install libgdal 2.1.3 libgdal
30+
install boost 1.63.0
31+
install boost_libsystem 1.63.0
32+
install boost_libfilesystem 1.63.0
33+
install boost_libprogram_options 1.63.0
34+
install boost_libregex_icu57 1.63.0
35+
install freetype 2.7.1 libfreetype
36+
install harfbuzz 1.4.2-ft libharfbuzz
37+
# deps needed by python-mapnik (not mapnik core)
38+
install boost_libthread 1.63.0
39+
install boost_libpython 1.63.0
5540
}
5641

5742
function setup_runtime_settings() {

scripts/setup_mason.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -eu
44
set -o pipefail
55

66
# we pin the mason version to avoid changes in mason breaking builds
7-
MASON_VERSION="new-pkgs"
7+
MASON_VERSION="181a39c"
88

99
function setup_mason() {
1010
if [[ ! -d ./.mason ]]; then

0 commit comments

Comments
 (0)