From 765e1ad0c6d71deac45382e3d3dad5ff838c9a43 Mon Sep 17 00:00:00 2001 From: Artem Pavlenko Date: Mon, 23 Nov 2020 16:04:01 +0000 Subject: [PATCH 01/10] Upgrade to ICU 58.1 + mason --- bootstrap.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 24706b8be..583b83fe6 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -8,7 +8,7 @@ todo - shrink icu data ' -MASON_VERSION="cce4ebf4" +MASON_VERSION="fde1d9f5" function setup_mason() { if [[ ! -d ./.mason ]]; then @@ -43,7 +43,7 @@ function install() { mason link $1 $2 } -ICU_VERSION="57.1" +ICU_VERSION="58.1" BOOST_VERSION="1.74.0" function install_mason_deps() { @@ -65,7 +65,7 @@ function install_mason_deps() { install boost_libsystem ${BOOST_VERSION} install boost_libfilesystem ${BOOST_VERSION} install boost_libprogram_options ${BOOST_VERSION} - install boost_libregex_icu57 ${BOOST_VERSION} + install boost_libregex_icu58 ${BOOST_VERSION} # technically boost thread and python are not a core dep, but installing # here by default helps make python-mapnik builds easier install boost_libthread ${BOOST_VERSION} From 34a42a8fa1cbc075cc28d118df70740583c47942 Mon Sep 17 00:00:00 2001 From: Nonemoticoner Date: Tue, 1 Dec 2020 23:10:43 +0100 Subject: [PATCH 02/10] Fix dead link to tutorials in INSTALL.md --- INSTALL.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL.md b/INSTALL.md index b701a7dc9..4ef4a2124 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -184,7 +184,7 @@ If you need help or want to participate starting points include: ### Cartographers TileMill, which uses Mapnik internally, offers great step by step tutorials for -learning advanced map styling: http://mapbox.com/tilemill/docs/crashcourse/introduction/ +learning advanced map styling: https://tilemill-project.github.io/tilemill/docs/crashcourse/introduction/ ### Programmers From 006c66e488858f124f32285dea700e64b5ba19bb Mon Sep 17 00:00:00 2001 From: Artem Pavlenko Date: Thu, 3 Dec 2020 09:14:24 +0000 Subject: [PATCH 03/10] Remove `sudo : false` per https://docs.travis-ci.com/user/reference/trusty#container-based-infrastructure --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 68494472a..a875600d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,6 @@ cache: - $HOME/.ccache dist: trusty -sudo: false matrix: include: From 7520e163406447656f58ead24cc2891d9f85ad16 Mon Sep 17 00:00:00 2001 From: Artem Pavlenko Date: Thu, 10 Dec 2020 13:00:48 +0000 Subject: [PATCH 04/10] travis-ci - disable Linux/gcc build --- .travis.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index a875600d3..51a2743c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,16 +19,16 @@ dist: trusty matrix: include: - - os: linux - name: Linux gcc-6 - env: >- - CXX="ccache g++-6" - CC="gcc-6" - addons: - postgresql: "9.5" - apt: - sources: [ 'ubuntu-toolchain-r-test'] - packages: [ 'libstdc++-6-dev', 'g++-6', 'xutils-dev', 'postgresql-9.5-postgis-2.3' ] + #- os: linux + # name: Linux gcc-6 + # env: >- + # CXX="ccache g++-6" + # CC="gcc-6" + # addons: + # postgresql: "9.5" + # apt: + # sources: [ 'ubuntu-toolchain-r-test'] + # packages: [ 'libstdc++-6-dev', 'g++-6', 'xutils-dev', 'postgresql-9.5-postgis-2.3' ] - os: linux name: Linux clang-3.9 env: >- From 6f3634088830791e386fdd1fe273a6711e299c6f Mon Sep 17 00:00:00 2001 From: Artem Pavlenko Date: Fri, 11 Dec 2020 11:29:51 +0000 Subject: [PATCH 05/10] upgrade dist+toolchain --- .travis.yml | 40 ++++++++++++---------------------------- 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/.travis.yml b/.travis.yml index 51a2743c7..b12587cbb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ language: generic +dist: xenial + git: depth: 10 submodules: false @@ -15,48 +17,30 @@ cache: directories: - $HOME/.ccache -dist: trusty - matrix: include: - #- os: linux - # name: Linux gcc-6 - # env: >- - # CXX="ccache g++-6" - # CC="gcc-6" - # addons: - # postgresql: "9.5" - # apt: - # sources: [ 'ubuntu-toolchain-r-test'] - # packages: [ 'libstdc++-6-dev', 'g++-6', 'xutils-dev', 'postgresql-9.5-postgis-2.3' ] - os: linux - name: Linux clang-3.9 + name: Linux clang env: >- - CXX="ccache clang++-3.9 -Qunused-arguments" - CC="clang-3.9" - ENABLE_GLIBC_WORKAROUND=true - before_install: - - export LINKFLAGS="-fuse-ld=gold-2.26" + CXX="ccache clang++ -Qunused-arguments" + CC="clang" + ENABLE_GLIBC_WORKAROUND=false addons: postgresql: "9.5" apt: - sources: [ 'ubuntu-toolchain-r-test' ] - packages: [ 'clang-3.9', 'libstdc++-4.9-dev', 'xutils-dev', 'postgresql-9.5-postgis-2.3' ] + packages: [ 'xutils-dev', 'postgresql-9.5-postgis-2.3' ] - os: linux - name: Linux clang-3.9 + coverage + name: Linux clang + coverage env: >- - CXX="ccache clang++-3.9 -Qunused-arguments" - CC="clang-3.9" + CXX="ccache clang++ -Qunused-arguments" + CC="clang" COVERAGE=true QUIET=true before_install: - - export LINKFLAGS="-fuse-ld=gold-2.26" - - export LLVM_COV="llvm-cov-3.9" + - export LLVM_COV="llvm-cov" addons: postgresql: "9.5" - apt: - sources: [ 'ubuntu-toolchain-r-test' ] - packages: [ 'clang-3.9', 'llvm-3.9', 'libstdc++-4.9-dev', 'xutils-dev', 'postgresql-9.5-postgis-2.3' ] + packages: [ 'xutils-dev', 'postgresql-9.5-postgis-2.3' ] - os: osx name: OSX clang # https://docs.travis-ci.com/user/languages/objective-c/#Supported-OS-X-iOS-SDK-versions From 17a1c72f4162ffcc51744e4f51006e3ac3da0f7d Mon Sep 17 00:00:00 2001 From: Artem Pavlenko Date: Fri, 11 Dec 2020 11:47:04 +0000 Subject: [PATCH 06/10] fix .travis --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b12587cbb..8502a6190 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,5 @@ language: generic -dist: xenial - git: depth: 10 submodules: false @@ -17,6 +15,8 @@ cache: directories: - $HOME/.ccache +dist: xenial + matrix: include: - os: linux @@ -28,6 +28,7 @@ matrix: addons: postgresql: "9.5" apt: + sources: [ 'ubuntu-toolchain-r-test' ] packages: [ 'xutils-dev', 'postgresql-9.5-postgis-2.3' ] - os: linux name: Linux clang + coverage @@ -40,6 +41,8 @@ matrix: - export LLVM_COV="llvm-cov" addons: postgresql: "9.5" + apt: + sources: [ 'ubuntu-toolchain-r-test' ] packages: [ 'xutils-dev', 'postgresql-9.5-postgis-2.3' ] - os: osx name: OSX clang From 9127d6334e570807e9afa6eadd58abbc27317674 Mon Sep 17 00:00:00 2001 From: Artem Pavlenko Date: Fri, 11 Dec 2020 12:36:37 +0000 Subject: [PATCH 07/10] travis-ci - update to postgis-2.4 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8502a6190..507b53c46 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ matrix: postgresql: "9.5" apt: sources: [ 'ubuntu-toolchain-r-test' ] - packages: [ 'xutils-dev', 'postgresql-9.5-postgis-2.3' ] + packages: [ 'xutils-dev', 'postgresql-9.5-postgis-2.4' ] - os: linux name: Linux clang + coverage env: >- @@ -43,7 +43,7 @@ matrix: postgresql: "9.5" apt: sources: [ 'ubuntu-toolchain-r-test' ] - packages: [ 'xutils-dev', 'postgresql-9.5-postgis-2.3' ] + packages: [ 'xutils-dev', 'postgresql-9.5-postgis-2.4' ] - os: osx name: OSX clang # https://docs.travis-ci.com/user/languages/objective-c/#Supported-OS-X-iOS-SDK-versions From fb6334287a682d05ec13b337608b4496f74ae216 Mon Sep 17 00:00:00 2001 From: Artem Pavlenko Date: Fri, 11 Dec 2020 13:02:25 +0000 Subject: [PATCH 08/10] re-enable glibc workaround --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 507b53c46..f3dbf5e57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ matrix: env: >- CXX="ccache clang++ -Qunused-arguments" CC="clang" - ENABLE_GLIBC_WORKAROUND=false + ENABLE_GLIBC_WORKAROUND=true addons: postgresql: "9.5" apt: From dca32e5cf381ade0a7ec000a62bdb5b5f460af05 Mon Sep 17 00:00:00 2001 From: Artem Pavlenko Date: Wed, 16 Dec 2020 11:13:11 +0000 Subject: [PATCH 09/10] travis ci - downgrade to isu 57.1 and boost 1.73.0 --- bootstrap.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 583b83fe6..5071d7e74 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -43,8 +43,8 @@ function install() { mason link $1 $2 } -ICU_VERSION="58.1" -BOOST_VERSION="1.74.0" +ICU_VERSION="57.1" +BOOST_VERSION="1.73.0" function install_mason_deps() { install ccache 3.3.1 @@ -65,7 +65,7 @@ function install_mason_deps() { install boost_libsystem ${BOOST_VERSION} install boost_libfilesystem ${BOOST_VERSION} install boost_libprogram_options ${BOOST_VERSION} - install boost_libregex_icu58 ${BOOST_VERSION} + install boost_libregex_icu57 ${BOOST_VERSION} # technically boost thread and python are not a core dep, but installing # here by default helps make python-mapnik builds easier install boost_libthread ${BOOST_VERSION} From 176b4bf8f77032bfa3d8404549283e19e663968a Mon Sep 17 00:00:00 2001 From: Artem Pavlenko Date: Wed, 16 Dec 2020 13:48:53 +0000 Subject: [PATCH 10/10] travis ci - remove glibcxx workaround check as we're building on xenial --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f3dbf5e57..6c26b52fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,6 @@ matrix: env: >- CXX="ccache clang++ -Qunused-arguments" CC="clang" - ENABLE_GLIBC_WORKAROUND=true addons: postgresql: "9.5" apt: