Commit graph

87 commits

Author SHA1 Message Date
Dane Springmeyer
29e78e15ec add COVERAGE configure option - only set coverage flags on libmapnik and plugins - refs #3344 2016-03-08 14:57:23 +01:00
Dane Springmeyer
2e9fd43095 add svg parsers to pre-compile [skip ci] 2016-03-08 14:57:22 +01:00
Dane Springmeyer
9baec5c22f Merge branch 'master' of github.com:mapnik/mapnik into spirit-x3 2016-03-03 09:32:25 -08:00
Dane Springmeyer
4c369f7b68 add more files to pre-build that take a long time [skip ci] 2016-03-03 08:05:05 -08:00
artemp
5ef5444fff Merge branch 'master' into spirit-x3 2016-03-01 14:12:19 +01:00
Dane Springmeyer
e836836bdc [make release] add variant, increase depth to avoid (likely) checkout problems of test data [skip ci] 2016-02-26 10:42:03 -08:00
Dane Springmeyer
b93d3e5d7e remove grammars from pre-compile since these are under flux /cc @artemp 2016-02-01 12:01:03 -08:00
artemp
4b5a73e21b Merge branch 'master' into spirit-x3 2016-02-01 10:04:07 +01:00
Mickey Rose
f9248914af travis: add SCons timings, fix comment in Makefile 2016-01-31 15:36:00 +01:00
Dane Springmeyer
971c37691b travis/osx - parellelize the heavy compile jobs
- We can probably get away with this since OS X
   does not have an OOM killer
 - Will watch to see if it actually helps overall build times...
2016-01-29 19:00:04 -08:00
artemp
3e866e63b2 Merge branch 'master' into spirit-x3 2016-01-29 11:15:19 +01:00
Mickey Rose
6d84094f77 move render_markers_symbolizer to separate .cpp 2016-01-29 00:12:18 +01:00
Mickey Rose
a7ecabcde3 move render_group_symbolizer to separate .cpp
- use abstract class render_thunk_list_dispatch for the callback
  instead of template parameter render_thunks
- add class scoped_glyph_positions_offset for temporary shifting
  of glyph positions
- remove render_offset_placements
2016-01-29 00:10:18 +01:00
Mickey Rose
7761d32ec5 split common group symbolizer stuff 2016-01-29 00:10:18 +01:00
Dane Springmeyer
b6d1e02939 repoint slow build list at image_filter_grammar 2016-01-28 12:13:02 -08:00
Dane Springmeyer
4eb26bb452 adapt to cpp file renames 2015-12-04 13:17:26 -05:00
Dane Springmeyer
dfc6a41a27 wip: add make release target [skip ci] 2015-07-27 19:17:31 -07:00
Jiri Drbalek
d3baf8041a fix make python for non-bash shells 2015-06-05 15:14:31 +00:00
Dane Springmeyer
9d9a1283d6 make grind: no need to source mapnik-settings + add grinding of visual tests 2015-05-23 12:05:40 -07:00
Dane Springmeyer
0c6991d668 gotta make the python bindings [skip ci] 2015-05-04 01:22:09 -07:00
Dane Springmeyer
a5e258344e make target to setup python bindings + run visual tests 2015-05-04 00:30:25 -07:00
Dane Springmeyer
ff3289abe9 add details about how tests+submodules work - refs #2789 [skip ci] 2015-04-30 08:11:53 -07:00
Dane Springmeyer
5a594dd0c1 move C++ test running to test/run + make output prettier 2015-04-30 07:41:16 -07:00
Dane Springmeyer
bd39189c6e heaviest compile first 2015-04-27 01:03:35 +02:00
Dane Springmeyer
cfeac9ab2f add back run_tests script 2015-04-27 00:45:12 +02:00
Dane Springmeyer
6048f43dfb avoid cleaning mason_packages 2015-04-27 00:28:26 +02:00
Dane Springmeyer
d9ea4e9b6e ensure clean valgrind run 2015-04-26 23:26:11 +02:00
Dane Springmeyer
ea6f217ad9 use mapnik-settings.env 2015-04-26 20:32:20 +02:00
Dane Springmeyer
edf7616b19 reorganize c++ tests 2015-04-25 22:08:12 +02:00
Dane Springmeyer
8bb605e2e9 move python bindings out of core #2773 - now at https://github.com/mapnik/python-mapnik 2015-04-24 09:04:00 +02:00
Blake Thompson
0fec41a87e Updated reprojection code 2015-04-07 11:55:45 -05:00
Dane Springmeyer
55fd38a25a back to j1 for first compiles since travis cannot build src/renderer_common/process_group_symbolizer.cpp 2015-03-24 16:42:44 -07:00
Dane Springmeyer
19cafa00fb makefile: speed up build by using libmapnik-json.a as proxy for whether 'heavy' compiles have run yet 2015-02-23 11:44:36 -08:00
Dane Springmeyer
56d1818862 Makefile clean: remove duplicate pyc cleanup 2015-02-09 13:20:39 -08:00
Dane Springmeyer
956d936162 fix pep8 linter command + update a few linted files 2015-02-02 10:38:08 -08:00
Dane Springmeyer
60d219a2aa makefile pre-build: fix target names 2015-01-27 16:22:40 -08:00
Dane Springmeyer
8d233becdc build process_group_symbolizer.cpp first along with markers 2015-01-27 15:54:36 -08:00
Dane Springmeyer
3e8b701194 bootstrap cleanups 2015-01-24 10:05:58 -08:00
Dane Springmeyer
83588937b9 silence boost warnings 2014-10-21 16:37:27 -07:00
Dane Springmeyer
3bd7ee87c6 clean config.cache by default 2014-09-30 16:40:08 -07:00
Dane Springmeyer
97dcd2fd59 only accept JOBS via make setting and default to 1 - closes #2430 2014-09-23 11:25:01 -07:00
Sean Gillies
c52994ff8b Allow user to specify a python executable.¬
¬
Fall back on `python`. Unlike the solution in PR #2395 this¬
puts all the responsibility for selecting the right python in the¬
case that "python" is Python 3 on the user. I've followed the lead¬
of the Python documentation Makefile. See

http://hg.python.org/cpython/file/340d48347295/Doc/README.txt
http://hg.python.org/cpython/file/340d48347295/Doc/Makefile

Intent is that if your `python` is Python 2 everything works as
before and that is your `python` is Python 3 but you have a
`python2` you can specify that instead.¬

Conflicts:
	run_tests
2014-09-03 15:56:58 -07:00
Dane Springmeyer
fe8e9a0094 remove unneeded Makefile variable [skip ci] 2014-08-14 13:40:08 -07:00
Dane Springmeyer
15d3ceffc8 make clean: also clear out shared libs 2014-05-05 10:08:40 -07:00
Dane Springmeyer
cd39a02d0c unhide the scons command run by make 2014-01-28 12:04:24 -08:00
Dane Springmeyer
c3d31993b8 fix return code for python run tests 2013-11-22 12:07:07 -08:00
Dane Springmeyer
66347f78e6 rework tests: always run locally 2013-11-22 12:01:02 -08:00
Dane Springmeyer
4397cfe279 make benchmark run against local libmapnik 2013-11-19 12:33:14 -08:00
Dane Springmeyer
c480d9d878 break out benchmark suite into individual cpp 2013-11-14 23:11:21 -08:00
Dane Springmeyer
661aa4c87a fix Makefile demo target path 2013-06-02 16:40:03 -07:00