sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6635 commits 112 branches 95 tags 181 MiB
Commit graph

404 commits

Author SHA1 Message Date
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
Dane Springmeyer
82ac99611e add LINKING option to control whether libmapnik is build static or shared and RUNTIME_LINK options to trigger dependency flags to compile against static libs 2011-08-11 19:14:00 +00:00
Dane Springmeyer
17e5fb7302 add PATH_INSERT option to allow pre-appending a PATH variable for finding programs like pkg-config and freetype-config and allow it and PKG_CONFIG_PATH setting to work with relative paths by completing dynamically 2011-08-11 15:49:57 +00:00
Dane Springmeyer
2d258e7bba scons: make speedier SCons startup default enabled 2011-08-11 14:35:02 +00:00
Dane Springmeyer
028f9ded5b scons: place warning modifiers directly after -Wall for clarity 2011-08-11 14:32:45 +00:00
Dane Springmeyer
15fa6f1e60 scons: add a WARNING_CXXFLAGS option which can be passed to place compiler warning modifiers after the default -Wall. This makes life better with the current clang/boost trunk warning - part of #805 2011-08-11 14:31:46 +00:00
Dane Springmeyer
64e2ffe226 scons: improve configure output around icu version checking 2011-08-11 14:17:17 +00:00
Dane Springmeyer
1f32c4c9d7 default to faster -O3 compiler optimization since this is well tested by now and debian packagers who originally ask for it to be set at -O2 can now change the default 2011-06-13 15:20:29 +00:00
Dane Springmeyer
1e01b2d0c0 enforce at least cairomm 1.8.0 - closes #736 2011-06-01 19:43:11 +00:00
Dane Springmeyer
b02c462a10 scons: print full path to the config.log output 2011-05-16 04:38:31 +00:00
Dane Springmeyer
c19ede5070 remove last references to boost_iostreams dependency 2011-05-10 15:57:45 +00:00
Dane Springmeyer
6fe9a0b58d update the abi fallback to 2.0.0 2011-05-02 18:42:58 +00:00
Dane Springmeyer
50fefa79f0 disable sqlite rtree check as it looks impossible to get working against ubuntu/debian packages - re-opens #403 2011-04-18 23:45:24 +00:00
Artem Pavlenko
c906dcea02 + restore gcc compile flags 2011-04-11 05:27:18 +00:00
Artem Pavlenko
e81761d270 + remove boost::iostreams dependency 2011-04-07 13:35:21 +00:00
Dane Springmeyer
2160a49b3f scons: at configure time, ensure libsqlite3 has rtree support built in - closes #403 2011-04-02 18:25:23 +00:00
Dane Springmeyer
27cc2f0dc5 catch errors in build time pkg-config parsing - closes #738 2011-04-02 03:11:42 +00:00
Dane Springmeyer
e9e805690f make ogr, gdal, sqlite plugins built by default as they are used for tests (but they are only built if dependencies are met) 2011-03-22 00:55:48 +00:00
Dane Springmeyer
578b434f4d trap exceptions in the configure check for whether boost regex has icu support 2011-03-12 02:46:52 +00:00
Dane Springmeyer
c3c5a20c29 by default attempt to compile with CAIRO support again (this was disabled during refactoring that broke cairo rendering) 2011-03-04 22:15:11 +00:00
Dane Springmeyer
faf3512f8f scons: fix ability to call 'install -c' and 'uninstall', broken since r2568 2011-03-01 16:36:45 +00:00
Dane Springmeyer
efb19dea6c make the requirement of boost_regex unicode support optional by detecting if boost_regex was itself built with ICU support 2011-02-28 20:00:56 +00:00
Dane Springmeyer
3b295143bc better workaround for unsupported GDAL framework linking on osx 2011-02-23 21:24:23 +00:00
Dane Springmeyer
df8a987501 disable SVG_RENDERER until #712 is resolved 2011-02-09 10:43:59 +00:00
Dane Springmeyer
bdc184c686 scons: make sure that we set the PKG_CONFIG_PATH before build 2011-02-08 03:27:08 +00:00
Dane Springmeyer
4720303507 one last workaround for now to fix potential gdal -framework configuration problem 2011-02-06 05:30:06 +00:00
Carlos López
40047e7a56 SVG_RENDERER working again after changes introduced in r2302. 
+ a boost::iterator is used to handle iteration in path grammar
+ svg_path_data_grammar consumes a reference to geometry, rather than a geometry, avoiding copy-construction
+ a size_type was added to geometry so it could model the attribute container concept
 2011-02-05 07:08:01 +00:00
Dane Springmeyer
4bb735d6c1 scons: another workaround for new gdal framework on os x 2011-02-03 22:07:00 +00:00
Dane Springmeyer
f1e1900480 scons: handle a gdal-config --libs that reports -framework GDAL on osx 2011-02-03 20:21:35 +00:00
Dane Springmeyer
58c6bdae9e fast track to --help if requested rather than forcing reconfigure 2011-02-03 08:16:39 +00:00
Robert Coup
ed306d7cbe #654 add svg2png utility 2011-01-26 01:19:01 +00:00
Dane Springmeyer
52eb8d3619 revert r2496 2011-01-05 18:15:19 +00:00
Dane Springmeyer
0614f5de24 support for boost trunk (1.46) by enforcing boost filesystem v2 for now 2011-01-05 01:27:11 +00:00
Dane Springmeyer
67efa6e18f osx: start work on seamless support for multiple python versions 2010-12-22 21:55:34 +00:00
Dane Springmeyer
be5cd7d307 scons: using geos-config program to configure geos plugin depedency 2010-12-21 21:43:25 +00:00
Dane Springmeyer
4bbc6ae344 scons: get the geos lib name right for help output and make sure to pickle whether we are building sample plugins 2010-12-21 21:04:18 +00:00
Dane Springmeyer
dbfd287098 scons: minor touchups to plugin reporting 2010-12-21 20:34:36 +00:00
Dane Springmeyer
20349d42f6 touchup and actuall install the 'howfast.py' little performance testing script 2010-12-16 16:32:06 +00:00
Dane Springmeyer
f2da944c29 scons: test whether python is 64bit enabled 2010-12-01 01:47:01 +00:00
Dane Springmeyer
88e1e30d9f scons: trunk requires at least icu 4.2, so enforce that at configure time - closes #482 2010-11-30 01:25:54 +00:00
Dane Springmeyer
b71c75bdeb clang++ caught bug - we need to first call lt_dlinit. Also add better error output based on returns from dladvise functions and simplify compile flag 2010-11-19 23:02:58 +00:00
Dane Springmeyer
20ffa2e7e6 scons: wow, libtool version reporting. fun 2010-11-17 21:31:42 +00:00
Dane Springmeyer
3b541414ab scons: more robust regex for detecting libtool version 2010-11-17 21:11:37 +00:00
Dane Springmeyer
f7784fd6a7 scons: move to regex for more robust libtool version detection 2010-11-17 20:23:28 +00:00
Dane Springmeyer
1114172e3e scons: add libtool version check 2010-11-17 19:53:13 +00:00
Lucio Asnaghi
4ce78f4a3f - fix in build system to allow GEOS to compile properly 2010-11-10 11:48:55 +00:00
Lucio Asnaghi
530ebcbccd - added SConstruct definitions to build "geos" input plugin 2010-11-10 11:11:10 +00:00
Dane Springmeyer
95ac40da03 scons: actually get the curl checking working 2010-10-24 21:22:22 +00:00
Dane Springmeyer
49ee8a2357 scons: configure check for libcurl - needed for the osm plugin - closes #651 2010-10-24 21:16:13 +00:00
Dane Springmeyer
ea39e6f69e add a directory for plugin templates - and add a first "hello world" with basic docs" 2010-10-24 08:04:16 +00:00
Dane Springmeyer
c511313c28 attach -pthreads to CXXFLAGS not LIBS 2010-10-12 05:41:36 +00:00
Dane Springmeyer
cd8b52a494 fix sytax 2010-10-12 05:36:26 +00:00
Dane Springmeyer
977ec6c498 shuffle addition of 'pthreads' flag so it is added before configure check 2010-10-12 05:34:41 +00:00
Dane Springmeyer
b498f858c5 use plural 'pthreads' on solaris 2010-10-12 05:25:32 +00:00
Dane Springmeyer
2c923d4cc2 scons: remove stale plugins when installing (will avoid common problem of old installed plugins with incompatible ABI) and shuffle color logic to make sure you can properly turn off color printing with COLOR_PRINT=False 2010-10-07 00:42:47 +00:00
Dane Springmeyer
9492d309e6 better checking for whether our target python is python 3 2010-09-26 22:49:14 +00:00
Dane Springmeyer
07bae46fd7 scons: more logic reporting around cairo support 2010-09-19 18:29:22 +00:00
Dane Springmeyer
523b09701e Add the ability to pass custom CXXFLAGS and LDFLAGS that will be prioritized above other compiler and linker flags 2010-09-18 18:02:15 +00:00
Dane Springmeyer
65ef9a3548 add ability to set the cc compiler and default it to gcc (solaris configure check fix), and touchups around CXXFLAGS 2010-09-18 16:50:05 +00:00
Dane Springmeyer
23d6dfd799 warn about Mapnik2 and pass wiki page 2010-08-31 00:17:22 +00:00
Dane Springmeyer
317830784e scons: normalize paths to make sure that trailing slashes are striped and the lib/include directories are removed with dirname 2010-08-25 22:20:19 +00:00
Dane Springmeyer
05d37a282f scons: quiet the output of the sorting function so it only prints once 2010-08-21 05:35:38 +00:00
Dane Springmeyer
0eb66e8340 scons: make sure to sort libs and includes paths after adding calling FindBoost and doing boost checks 2010-08-21 05:27:29 +00:00
Dane Springmeyer
a8423428e8 scons: don't build cairo rendering backend unless requested (as cairo is not being actively maintained at this point in trunk) 2010-08-21 04:22:36 +00:00
Dane Springmeyer
e6f75a4741 make SVG_RENDERER build default false because it requires a more recent boost version than scons checks for - TODO add finer grained boost check if SVG_RENDERER is enabled 2010-08-20 21:35:31 +00:00
Dane Springmeyer
9a1983c670 scons: tweak logic for whether a path is a 'system' path, avoiding case where a custom path like /opt/mapnik/lib would be assumed to be a standard system path 2010-07-28 23:13:24 +00:00
Dane Springmeyer
0be5f95e9e scons: fix the order of deletion of nested directories during uninstall action 2010-07-24 22:55:21 +00:00
Dane Springmeyer
d58ee9e0f9 use SCons to build up the mapnik viewer ini file 2010-07-22 22:14:19 +00:00
Dane Springmeyer
dc99025348 make compile of svg renderer optional (but on by default) 2010-07-22 21:53:52 +00:00
Carlos López
30e85c4d58 Added template parameter and data member to svg_renderer for holding the output stream. 2010-07-20 00:40:37 +00:00
Dane Springmeyer
31c60dc066 add mapnik-config script and pkg-config file - #175 2010-07-18 21:34:08 +00:00
Dane Springmeyer
51a791eb77 scons: only attach uninstall actions if actually uninstalling - #311 2010-07-18 21:26:50 +00:00
Dane Springmeyer
267b48de49 add ability to uninstall all tracked scons targets using an 'uninstall' argument like 'scons uninstall' - closes #311 2010-07-18 20:39:05 +00:00
Dane Springmeyer
b0d568dff1 add directory for C++ tests, and first C++ test against the font engine functions 2010-07-15 23:09:33 +00:00
Dane Springmeyer
7d8b6bd126 scons: remove the '_CPPDEFFLAGS' variable, which otherwise would place -DNone in the compiler arguments when no other configure arguments are sent to scons 2010-07-15 16:29:39 +00:00
Dane Springmeyer
d463883f6f scons: making sure things exist - prepping for out of source build 2010-07-15 00:40:52 +00:00
Dane Springmeyer
08e96be4a1 scons: better handling of PYTHON_INCLUDES and HAVE_LIBXML2 2010-07-15 00:20:50 +00:00
Dane Springmeyer
d549cfe30a scons: only apply HAS_CAIRO & HAS_PYCAIRO flags to cairo related files 2010-07-14 22:47:34 +00:00
Dane Springmeyer
635a487463 scons: make sure to initialize cairo variables 2010-07-14 05:33:55 +00:00
Dane Springmeyer
4d477a47cd scons: conditionally add CXXFLAGS for headers needing Cairo support 2010-07-14 04:40:33 +00:00
Dane Springmeyer
146c13ba09 scons: specialize CFLAGS for the only python cpp file that needs SVN_REVISION passed to it 2010-07-14 00:48:06 +00:00
Dane Springmeyer
5a445ff709 check for python development headers 2010-07-07 06:16:22 +00:00
Dane Springmeyer
04b7f5aa6f maintain boost 1.42/1.41 compatibility as lemexe appears to behave like no_skip with boost 1.42 2010-06-23 03:53:29 +00:00
Artem Pavlenko
8b75f8bffe + no_skip[] requires boost >= 1.43 2010-06-21 09:40:54 +00:00
Dane Springmeyer
c2c2c077aa if in FAST mode skip setting the SVN_REVISION as this will prompt a full recompile (todo: avoid this problem more systematically by only appending g++ flags for the exact .cpp files that need them) 2010-06-08 20:41:31 +00:00
Dane Springmeyer
9804e7e90d scons: make libjpeg dependency optional (still required by default) 2010-06-03 19:50:27 +00:00
Dane Springmeyer
58b0a3e5ff scons: add 'PYTHON_DYNAMIC_LOOKUP' boolean to allow for dynamically loading python symbols rather than direct linking on OSX (default behavior still the same) - addresses #453 2010-04-28 05:39:27 +00:00
Dane Springmeyer
15c7ab6233 add ability install XML upgrade script 2010-04-28 05:35:26 +00:00
Dane Springmeyer
c13e2eab8d prioritize /usr/local above other potential paths like /opt/local - TODO: make configurable 2010-04-15 21:44:59 +00:00
Dane Springmeyer
915cc0a265 scons: fixup logic for setting HAS_BOOST_SYSTEM SCons environment variable 2010-03-18 20:44:53 +00:00
Artem Pavlenko
dbafd60d37 + tidy up 2010-03-17 21:06:18 +00:00
Artem Pavlenko
215b42b073 + use /mapnik2/ as LIB_DIR_NAME to be able have both mapnik 
+ mapnik2 side by side
 2010-03-17 21:02:51 +00:00
Artem Pavlenko
2ed6c57c21 + revert template instantiation depth back to 200 
won't compile on os x 64-bit gcc version 4.2.1 (Apple Inc. build 5646)
 2010-03-08 11:54:52 +00:00
Artem Pavlenko
7724bc232d + reduce template-depth to 160 
Please enter the commit message for your changes. Lines starting
 2010-03-03 19:53:11 +00:00
Dane Springmeyer
f0fb2fa3c6 scons: add options to allow controlling link order (and include order) sent by SCons to the linker line, as predictably /usr/lib would come first and take preference over paths such as /usr/local/lib while compiles may have been against /usr/local/include - closes #484 2010-02-23 02:40:46 +00:00
Dane Springmeyer
7c0b28d4d7 scons: fix subtle bug in scons usage resulting in lost paths on mac os x 2010-02-22 23:51:30 +00:00
Dane Springmeyer
e4c952052d check for both 'debian' and 'Ubuntu' to figure out lib schema 2010-02-22 19:53:44 +00:00
Dane Springmeyer
a0f4b7ec4a don't install by default in lib64 on debian systems - closes #394 2010-02-22 16:49:50 +00:00
Dane Springmeyer
07186fc6bb ensure shapeindex links against boost system if available (boost >=1.35) to avoid potential problems in indirect linking on linux (essentially directly dynamically linking like we previously only did on os x) - closes #517 2010-02-21 01:00:09 +00:00
Dane Springmeyer
c2813464a9 scons: fix up libicucore support, adding ability to pass entire path to lib 2010-01-30 00:59:36 +00:00
Dane Springmeyer
e5673e239b increment ABI versions 2010-01-11 18:53:50 +00:00
Dane Springmeyer
a741d43698 scons: support py3k in python configuration detection 2010-01-07 17:14:54 +00:00