Commit graph

12673 commits

Author SHA1 Message Date
Dane Springmeyer
48316d47b0 fixes for auto-release script 2016-09-06 00:21:20 -07:00
Dane Springmeyer
4cc0706940 start working on #3335 2016-09-06 00:21:20 -07:00
bergwerkgis
49a1799d4f Merge branch 'master' of https://github.com/mapnik/mapnik 2016-09-05 14:00:34 +00:00
bergwerkgis
28162f0720 [skip travis] fix relative path to get-boost-icu-version-from-sdk.ps1 (differs when called from windows-builds) 2016-09-05 14:00:17 +00:00
artemp
66999f1f87 travis up from 35 to 40 min 2016-09-05 15:54:40 +02:00
artemp
014f98043f add missing include path 2016-09-05 15:41:14 +02:00
artemp
fc0b57de24 update CHANGELOG 2016-09-05 15:41:14 +02:00
bergwerkgis
a79bd73105 refs #3509, get boost and icu versions directly from SDK files 2016-09-05 13:13:24 +00:00
artemp
747ca7470c remove duplicate #pragma 2016-09-05 11:39:36 +02:00
artemp
8e0e344b72 Merge branch 'master' into geometry-refactor 2016-09-05 09:41:52 +01:00
Dane Springmeyer
3741a7f348 fix -Wshadow warnings caught by g++-5 2016-09-03 09:58:40 -07:00
Dane Springmeyer
e580d0b1d6 simplify travis-command-wrapper.py output 2016-09-03 09:32:20 -07:00
Dane Springmeyer
076ab1fa6c fix mason cflags/ldflags return 2016-09-03 09:31:26 -07:00
Dane Springmeyer
c3f7d947a6 travis: up to 35 min limit 2016-09-02 21:12:08 -07:00
Dane Springmeyer
3be9a623fc travis: up to 25 min limit 2016-09-02 19:06:07 -07:00
Dane Springmeyer
c67e505a74 mason: install zlib system symlink to ensure consistently zlib linking [skip ci] 2016-09-02 17:52:02 -07:00
Dane Springmeyer
7dcf8eac35 increase deadline to 15 min 2016-09-02 17:47:40 -07:00
Dane Springmeyer
57331a40ce try to get travis-command-wrapper deadline working 2016-09-02 17:19:22 -07:00
Dane Springmeyer
acd90042fb geojson.input: minor code adjustments
- Avoids making copy of inline string to save memory
 - Moves duplicated code out of #ifdef to be more readible
2016-09-02 15:51:58 -07:00
Dane Springmeyer
fa44f0e247 Add memory_datasource test + fix returning of invalid_featureset for emptyset 2016-09-02 15:09:45 -07:00
Dane Springmeyer
73715afdb8 travis: fix broken grep 2016-09-02 14:44:35 -07:00
Dane Springmeyer
35d9435952 appveyor: only upload test failures not all visual tests 2016-09-02 12:56:00 -07:00
Dane Springmeyer
09ec0ba709 stop build at 25 minutes (well before travis fails the job at 50) to ensure at least partial ccache results are uploaded 2016-09-02 12:09:19 -07:00
Dane Springmeyer
687af49f47 bump BOOST_VERSION 2016-09-02 12:00:57 -07:00
Dane Springmeyer
5a21b1fc05 better wrapper args 2016-09-01 18:53:55 -07:00
Dane Springmeyer
7075a361cc try travis-command-wrapper.py to help cache get created even on job that timed out - refs travis-ci/travis-ci#4472 2016-09-01 18:13:06 -07:00
Dane Springmeyer
d19c38de17 upgrade ccache / convert to generic travis language 2016-09-01 16:59:18 -07:00
artemp
38bff90a99 Merge branch 'master' into geometry-refactor 2016-09-01 16:06:20 +01:00
Dane Springmeyer
4b06dfe9b4 Avoid warnings when building the g++5 2016-08-31 11:09:27 -07:00
Dane Springmeyer
02c2338c43 mapnik-config: strip clang specific warning flags 2016-08-31 11:09:11 -07:00
artemp
af099a57ef topojson grammar - change interface + instantiate with Iterator = char const* to reduce binary size 2016-08-31 17:42:18 +01:00
artemp
f360f50eed JSON - make generic_json a proper spirit grammar and reduce code bloat 2016-08-31 14:36:35 +01:00
Dane Springmeyer
3f26a1f23f use latest visual test data 2016-08-30 12:37:33 -07:00
artemp
f55b3b3bb3 Merge branch 'master' into geometry-refactor 2016-08-30 14:39:44 +01:00
Dane Springmeyer
d1301f4360 Merge pull request #3504 from mapnik/update-mason-deps
Target latest version of deps for visual/unit tests
2016-08-26 16:33:18 -07:00
Dane Springmeyer
8b954a6fc3 Get correct package of lndir 2016-08-26 14:30:47 -07:00
Dane Springmeyer
95331eda40 temporary workaround for https://github.com/mapbox/mason/issues/230 2016-08-26 13:40:28 -07:00
Dane Springmeyer
799178c7cc update to latest test data 2016-08-26 13:20:50 -07:00
artemp
d747f326f2 CHANGELOG - fix typo and update 2016-08-26 14:39:56 +01:00
artemp
842522b287 Merge branch 'master' into geometry-refactor 2016-08-26 09:06:05 +01:00
artemp
69b0ee1ada Merge branch 'mapycz-fix-building-symbolizer' 2016-08-25 18:21:35 +01:00
Jiri Drbalek
2f98b8965b update visual tests data 2016-08-25 09:36:30 +00:00
Jiri Drbalek
8b18c605fd no need for heap allocation 2016-08-25 08:01:31 +00:00
Jiri Drbalek
6da9de5739 fix closing segment 2016-08-25 08:01:25 +00:00
artemp
56c6a1ea62 Merge branch 'master' into geometry-refactor 2016-08-24 11:14:01 +01:00
artemp
603879f1c0 Merge remote-tracking branch 'origin/geometry-refactor' into geometry-refactor 2016-08-24 10:46:20 +01:00
artemp
fe007915df Revert "Revert "mapnik::variant - use std::tuple<Typess...> instead of mpl::vector<Types...> and remove Boost.MPL dependency""
and remove `<boost/fusion/adapted/std_tuple.hpp>`

This reverts commit b6cc48fd40.
2016-08-23 15:45:15 +01:00
Dane Springmeyer
f81583554a Merge branch 'master' of github.com:mapnik/mapnik into geometry-refactor 2016-08-22 16:19:17 -07:00
Dane Springmeyer
c6b1abcdb6 update mason deps and test data - refs mapnik/test-data#8 mapnik/test-data-visual#36 2016-08-22 15:12:25 -07:00
Dane Springmeyer
b6cc48fd40 Revert "mapnik::variant - use std::tuple<Typess...> instead of mpl::vector<Types...> and remove Boost.MPL dependency"
This reverts commit 6613222b84.
2016-08-22 11:40:06 -07:00