Commit graph

305 commits

Author SHA1 Message Date
Artem Pavlenko
254b3c9fa7 Merge branch 'master' into geometry-clipping
Conflicts:
	SConstruct
	include/mapnik/symbolizer_helpers.hpp
	src/placement_finder.cpp
2012-03-09 14:18:41 +00:00
Dane Springmeyer
54e7bb41c6 add no-omit-frame-pointer to debug flags to ensure without question it is not enabled 2012-03-09 12:56:00 +00:00
Dane Springmeyer
c5c0f92247 save the maps in the right place for visual tests 2012-03-08 17:04:51 -08:00
Dane Springmeyer
c47dae692a add no-omit-frame-pointer to debug flags to ensure without question it is not enabled 2012-03-07 15:34:59 -08:00
Dane Springmeyer
03bfc015a6 DEBUG_UNDEFINED should also trap illegal instructions 2012-02-21 11:04:09 -08:00
Dane Springmeyer
1b3d2324de scons: fully workaround potential compile error with gcc/boost 1.42/ubuntu relating to interprocess bug - refs #1001 and #950 2012-01-08 17:21:04 -08:00
Dane Springmeyer
9b859bbc81 scons: pass boost version through env 2012-01-08 17:13:19 -08:00
Dane Springmeyer
556bc2c869 remove special ltdl dladvise usage - no longer needed after #790 2011-12-06 18:23:01 -08:00
Dane Springmeyer
1700ffe9cf remove svn revision reporting as it is not longer relevant to git versioned mapnik 2011-12-06 16:52:50 -08:00
Artem Pavlenko
14700dba16 switch back from mapnik2 to mapnik
add mapnik2 module which redirects to mapnik and issues DeprecationWarning
2011-11-23 11:33:58 +00:00
Dane Springmeyer
62041bfd77 scons: merge path replace functionality from tilemill build branch - useful for ensuring quality binary compiles 2011-11-16 12:47:31 -08:00
Dane Springmeyer
f8316fcbe8 scons: fix rtree config check if statically linking sqlite3 2011-11-15 13:23:10 -05:00
Dane Springmeyer
25b14c3503 scons: Add DEBUG_UNDEFINED setting to trigger clang/llvm runtime behavior checking 2011-11-14 00:49:46 -08:00
Dane Springmeyer
e59e1fc50f scons: ensure sorting of libs/includes is the same 2011-11-13 19:12:39 -08:00
Dane Springmeyer
24242cd504 scons: fix plugin_base env 2011-11-13 17:00:08 -08:00
Dane Springmeyer
eb2bd4a6d9 scons: enable the sqlite rtree check 2011-11-13 16:13:37 -08:00
Dane Springmeyer
f987c58ccd scons: better test for rtree support 2011-11-13 15:13:49 -08:00
Dane Springmeyer
4b09df71aa rollback applying visibility contraints to plugins 2011-11-11 17:04:17 -08:00
Dane Springmeyer
1d881af35a reduce the size of plugin libraries by hiding unneeded symbols 2011-11-11 15:37:10 -08:00
Dane Springmeyer
d3f7187b9a scons: cache SVG_RENDERER configure value 2011-11-01 11:57:43 -04:00
Dane Springmeyer
867cc3bd59 scons: make second freetype check conditional on freetype-config availability 2011-10-29 22:34:38 -07:00
Dane Springmeyer
d8f19fab05 always link to boost system - closes #931 2011-10-25 19:29:51 -07:00
Robert Coup
deb4e6b6c3 Do a proper check for BOOST_PYTHON_LIB in scons, and change it to be only the library name. re: mapnik-packaging:#3 2011-10-21 16:39:35 -07:00
Dane Springmeyer
37143430ba reduce verbosity of configure output 2011-10-19 21:40:49 -07:00
Artem Pavlenko
27637494b1 ignore -Wparenthes , -Wchar-subscripts warnings
(helpful with clang++)
2011-10-19 17:34:44 +01:00
Dane Springmeyer
775e6246c0 remove duplicate entry for csv plugin in build list 2011-10-18 20:50:54 -07:00
Dane Springmeyer
fbdb7afd76 make csv plugin compile by default so we can start using easily for testing mapnik more broadly (avoiding ogr dependency for json reading) 2011-10-18 18:22:02 -07:00
Dane Springmeyer
d50b175fc3 Merge branch 'master' into csv_plugin 2011-10-14 20:31:36 -07:00
Dane Springmeyer
78636d335a add PATH_REMOVE option to scons to completely strip a given path from linking and compile commands - useful for binary building 2011-10-13 14:19:21 -07:00
Dane Springmeyer
9e6c572b0a Merge branch 'master' into csv_plugin 2011-10-12 16:34:39 -07:00
Dane Springmeyer
285591f370 move bundled agg sources into depedencies subdirectory (as we may bundle other deps there too to reduce clutter) and remove all traces of unused tinyxml (ptree now uses rapidxml header-only library internally) - refs #913 2011-10-11 20:22:49 -07:00
Dane Springmeyer
9c32da33f5 new csv plugin should not be compiled by default yet 2011-10-11 18:17:52 -07:00
Dane Springmeyer
cb3b509da3 add new csv datasource plugin 2011-10-11 18:11:59 -07:00
Dane Springmeyer
49f28cad40 switch back to less agressive usage of scons caching basically allowing scons to check depedencies more at the cost of startup time 2011-09-15 22:15:04 +00:00
Dane Springmeyer
b01b21f24d move template-depth max to 300 to allow wkt parser compile with boost 1.47 on RHEL - closes #874 2011-09-10 05:37:19 +00:00
Dane Springmeyer
8e94bf9188 expose first pass at rendering statistics via build option 'RENDERING_STATS' - refs #780 2011-09-01 05:14:25 +00:00
Dane Springmeyer
1e37cbd248 python: make dynamic lookup of symbols default build for python - this has been battle tested nowdefault 2011-09-01 01:30:23 +00:00
Dane Springmeyer
b57a079a38 only link to bz2 if were linking statically 2011-08-31 03:05:01 +00:00
Dane Springmeyer
22c39d91ba scons: rename all SConscript files to more friendly name of 'build' with a python extension for quick syntax detection in editors 2011-08-30 05:32:01 +00:00
Dane Springmeyer
3c3d449c6f scons: initialize CAIROMM_LINKFLAGS properly 2011-08-29 21:48:19 +00:00
Dane Springmeyer
3323f0e47d scons: disable built targets not ready for release and only intended for development branch 2011-08-29 21:06:35 +00:00
Dane Springmeyer
b80bd6bc29 scons: allow passing CAIRO_LIBS and CAIRO_INCLUDES to optionally avoid pkg-config usage, and if pkg-config is needed and not found report cairo/cairomm will not be available - closes both #835 and #836 2011-08-29 18:52:35 +00:00
Dane Springmeyer
989148aec0 scons: be less restrictive about what is likely a system path - may help debian compiles - closes #716 2011-08-19 00:21:55 +00:00
Robert Coup
93d65a6e36 Fix LIB_DIR_NAME handling (from broken nightlies) 2011-08-16 03:18:24 +00:00
Dane Springmeyer
94d3210bcd scons: fix handling of LIB_DIR_NAME which broke ubuntu nightlies and condence all path logic further 2011-08-15 07:00:06 +00:00
Dane Springmeyer
3e67c1d694 scons: centralize install path info 2011-08-12 21:31:28 +00:00
Dane Springmeyer
da834706c6 scons: start condensing more global variables and improve support for static linking 2011-08-12 20:01:09 +00:00
Dane Springmeyer
4072daa34a scons: make potentially relative paths absolute for boost as well 2011-08-12 00:01:04 +00:00
Dane Springmeyer
3b424e3767 allow compile against ICU 4.0 - needed to be able to link against osx provided libicucore.dylib 2011-08-11 21:13:55 +00:00
Dane Springmeyer
af62ad9c27 scons: collect and propogate the libs used to link libmapnik 2011-08-11 21:11:11 +00:00