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

588 commits

Author SHA1 Message Date
Dane Springmeyer
65b03a3230 scons: try to unbreak boost_python lib check on linux 2012-07-20 13:56:21 -07:00
Rich Wareham
ee7ebb61f2 SConstruct: trivial typo fix 'henche' -> 'hence' 2012-07-19 16:08:25 +01:00
Dane Springmeyer
b74738dd91 scons: make a failure to link boost_python non-fatal 2012-07-06 18:31:36 -07:00
Dane Springmeyer
17d3414b7a speed up scons by > 2x 2012-07-06 18:08:19 -07:00
Dane Springmeyer
3ddd38116c Merge branch 'master' of github.com:mapnik/mapnik 2012-07-06 11:54:04 -07:00
Dane Springmeyer
6e5a68f372 stop defaulting to lib64 on 64 bit unix systems - closes #1297 2012-07-06 11:35:29 -07:00
Dane Springmeyer
18d2c041b5 respect BOOST_APPEND for boost_python configure check 2012-07-06 07:48:23 -07:00
Dane Springmeyer
906de8e317 simplify boost_python library configure checks 2012-07-05 11:54:43 -07:00
Dane Springmeyer
c113fa8adb scons: no need to link python and be more concise about restoring env backup 2012-06-15 14:05:59 -04:00
Dane Springmeyer
5df056ae4c scons: expose CUSTOM_CFLAGS to enable custom CFLAGS to be used during the configure stage 2012-06-13 17:17:58 -04:00
Dane Springmeyer
fa46f97b73 Merge branch 'master' of github.com:mapnik/mapnik 2012-06-13 17:10:27 -04:00
Dane Springmeyer
30559a0610 scons: also set LINKFLAGS/LDFLAGS up front to ensure they are used in configure checks 2012-06-13 17:10:15 -04:00
Artem Pavlenko
e89eb99e28 + geojson input plugin (thanks, @tmcw!) 2012-06-13 13:30:58 +01:00
Dane Springmeyer
b7052029d8 start requiring >= boost 1.47 to enable things like the carto parser to be integrated soon 2012-05-24 17:07:56 -07:00
Dane Springmeyer
09426bf324 remove option to link againt external AGG - our local copy has critical fixes and is required 2012-05-24 17:05:51 -07:00
kunitoki
0e5dcbd810 - fixed unwanted behaviour with default log severity in SConstruct #937 2012-05-24 00:02:43 +02:00
Dane Springmeyer
0ccabf2650 whitespace 2012-04-26 19:57:03 -04:00
Dane Springmeyer
b34e0c02a6 the osm plugin is required now for visual tests to enable it by default 2012-04-19 11:27:33 -07:00
Dane Springmeyer
c33fdfd848 disable logging on by default until #1175 is resolved (refs #1175) 2012-04-11 18:08:11 -07:00
Dane Springmeyer
4d4316f7bc enable logging by default to maintain relatively similiar warning behavior as to pre-logging framework (TODO: perf testing) 2012-04-11 11:32:04 -07:00
kunitoki
0cc1dfdf44 Merge branch 'master' of github.com:mapnik/mapnik 2012-04-10 17:51:48 +02:00
kunitoki
47e847cde1 - get rid of setting logger format in CXXFLAGS 2012-04-10 17:51:20 +02:00
Dane Springmeyer
330504e9a4 enable building svg2png tool - refs #1137 2012-04-10 08:47:48 -07:00
kunitoki
81c9dd7b6b - added the ability to set the default global severity from scons configure 
- initial check in of setting global severity from getenv (todo)
 2012-04-10 16:19:51 +02:00
kunitoki
c31d4b69a1 - avoid using -rdynamic on compilers different than gcc 2012-04-10 11:21:31 +02:00
Dane Springmeyer
566ae578bb scons: do not use -rdynamic flag on os x 2012-04-07 17:55:41 -07:00
kunitoki
af201551b8 got rid of old CVS $Id comments kludge in files 2012-04-08 02:45:01 +02:00
kunitoki
1f351e0e09 implement new debug system 2012-04-08 02:20:56 +02:00
Dane Springmeyer
ba4d815972 compile the c++ demo by default 2012-04-04 15:20:18 -07:00
Dane Springmeyer
e22e47dfcc scons: when statically linking: link extra icu libs needed by regex 2012-03-27 19:14:01 -04:00
Dane Springmeyer
3b498efbd9 fixup font registration code ensuring invalid fonts will warn but not throw and register_fonts will only return success if > one font is registered and none have failed 2012-03-23 15:07:28 -07:00
Dane Springmeyer
0beca49b2a scons: when parsing xml2-config only pull --cflags to avoid uneeded pollution of other libs on osx (namely libicucore) 2012-03-21 15:38:32 -07:00
Dane Springmeyer
2abe02bd96 make available MAPNIK_VERSION_STRING in c++ header (not just in python) and add MAPNIK_VERSION_IS_RELEASE define that indicates if the code is released 2012-03-14 18:30:32 -07:00
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
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
Dane Springmeyer
de4032a602 scons: make sure help is displayed if -h or --help is supplied even if we are not able to configure successfully and add more user friendly output for dependencies that are not found 2010-01-05 23:51:10 +00:00
Artem Pavlenko
98f5a79129 + only apply lib64 schema on Linux 
(TODO: check for Debian)
 2009-12-16 21:00:26 +00:00
Artem Pavlenko
47dc1e197b + merge mapnik2 to trunk 2009-12-16 20:02:06 +00:00
Dane Springmeyer
f60fa76242 merge 0.7. branch changes back into trunk 2009-12-15 19:25:35 +00:00
Dane Springmeyer
cee8805369 remove unneeded OSX -D flag 2009-12-07 06:44:41 +00:00
Dane Springmeyer
3c9655b721 improve reliability of default python linking on os x - closes #380 2009-12-05 03:07:58 +00:00
Dane Springmeyer
d669706f68 make sure to read from config.py if switching from FAST=True to FAST=False during configure stage 2009-12-02 22:32:57 +00:00
Dane Springmeyer
c22ab63dc9 FAST and JOBS Scons options never worked because they need to be applied to the build step not configure - thanks timlinux for catching 2009-12-02 22:13:48 +00:00
Dane Springmeyer
8c1538b152 fix typo 2009-11-25 09:05:08 +00:00
Dane Springmeyer
b104253d9c Add ability to link to custom icu lib name, and remove the unneeded linking to icudata on osx, while offering compiler flags required for compiling against libicucore provided by Apple 2009-11-24 20:32:41 +00:00
Dane Springmeyer
71de9ab571 scons: don't attempt to print in color when building on win32 and more properly quote strings that are shelled out to python 2009-09-23 18:55:23 +00:00
Dane Springmeyer
a5174cd3c1 scons: allow for boost lib symlinks without dashes, and search on libboost_thread if building with multi threading support (to accomodate potentially limited thread lib names on gentoo) 2009-08-04 15:56:21 +00:00
Dane Springmeyer
45266074c8 scons: fix typo, and ensure all temp output is writeable 2009-07-26 01:08:51 +00:00
Dane Springmeyer
50e3799053 scons: deleting the scons db is not needed, just ensuring permissions work for non-root users to avoid dependency checks failing for lousy reasons 2009-07-24 07:38:26 +00:00
Dane Springmeyer
ae819defad scons: be more aggressive about searching for boost lib naming if 'append' is not specified - improves upon r1200 (#297) 2009-07-22 01:31:35 +00:00
Dane Springmeyer
8676d23081 fix logic in the svn_revision define #385 2009-07-17 20:54:11 +00:00
Dane Springmeyer
9ce6792eda add a function to query for the svn revision of the mapnik python bindings 2009-07-17 20:51:39 +00:00
Dane Springmeyer
817720e1c5 increment ABI version numbers 2009-07-09 01:16:52 +00:00
Dane Springmeyer
28e7b5bf14 scons: when auto-finding boost libraries take the shortest boost library name found to avoid problems with variable extension naming on linux (TODO add better regex approach) 2009-07-08 21:08:13 +00:00
Dane Springmeyer
22647f3068 add env inheritance back to SCons (as discussed with artem to enable finding libraries and programs in custom locations) 2009-07-08 18:40:10 +00:00
Dane Springmeyer
6c846d77a6 add SCons flag for controlling compile-time use of SHAPE_MEMORY_MAPPED_FILE 2009-07-08 00:53:13 +00:00
Dane Springmeyer
552d0c07de make the full path explicit in the libmapnik.dylib 'install_name' (on osx) closes #374 2009-07-07 23:23:07 +00:00
Dane Springmeyer
3f57087d54 scons: remove inheritance of os.environ, and add the ability to specify and store PKG_CONFIG_PATH as SCONS variable - see #217 and r1187(which removed other reference to os.environ) 2009-07-02 00:48:42 +00:00
Dane Springmeyer
5907593f6a scons: provide support for auto-detection of boost libs/headers/libname in using set of prefix directories (should help auto-detection of source installs of boost in /usr/local and macports installs in /opt/local) - closes #297 2009-07-01 23:52:51 +00:00
Artem Pavlenko
21d76f574c + added '4' optimization level, enables link-time optimization 
for llvm-gcc (OS X)
+ build core library first (reverting build order change in r1192 as it
  broke OS X builds)
 2009-06-30 16:21:12 +00:00
Dane Springmeyer
0e7ca8ed44 avoid unnessary linking of plugin-only libs by libmapnik by changing SConscript execution order (addresses #371, more work needed in #214) 2009-06-29 19:21:47 +00:00
Artem Pavlenko
7ebe50d9de + Cleaner builds - don't import everything from ENV! 
+ Add FRAMEWORK_SEARCH_PATH option for Max OS X
 2009-06-29 14:04:44 +00:00
Dane Springmeyer
1af2f6b77f scons: revert testing code 2009-06-08 09:23:59 +00:00
Dane Springmeyer
b2c295c259 scons: increment boost version required 2009-06-08 08:53:54 +00:00
Dane Springmeyer
e2fd9c8329 don't prompt panic, use yellow warning color for optional skipped dependencies - closes #329 2009-04-30 23:33:48 +00:00
Dane Springmeyer
618fa0d2c0 restore compilation to shapeindex on mac os x after r1113 2009-04-29 00:06:10 +00:00
Lucio Asnaghi
eefd9f0350 + added SConscript file for the kismet plugin so now should be compilable like any other plugin (should close #293) 2009-04-28 20:20:41 +00:00
Dane Springmeyer
3dd616007d Add FULL_LIB_PATH option for OS X to link in the full path to libmapnik.dylib in the library itself 2009-04-26 03:33:29 +00:00
Dane Springmeyer
364b6f72c5 scons: provide option to avoid color printed terminal output 2009-04-14 00:01:21 +00:00
Dane Springmeyer
d7429f75a1 scons: allow a user to switch back from FAST=True to FAST=False 2009-04-01 15:08:56 +00:00
Dane Springmeyer
08669a08fb scons: add an option to turn on XML spirit debug output in addition to debug mode (note earlier commit added part of this patch http://trac.mapnik.org/changeset/1027/trunk/include/mapnik/filter_parser.hpp) - closes #150 2009-04-01 03:31:24 +00:00
Dane Springmeyer
6166da7c22 scons: make sure to respect options in 'config.py' over defaults stored in opts, fix up permissions and flush the .sconsign.dblite when switching to FAST build - closes #261 and #264 2009-03-30 16:52:31 +00:00
Dane Springmeyer
0e8b0a0668 scons: exit with proper return code indicating an error if we are missing required dependencies 2009-03-09 05:00:46 +00:00
Dane Springmeyer
ed695f6aae scons: avoid skipping configure if --clean is requested since it will bork scons given the need for the configured/pickled dictionary to populate env variables in Sconscript files - thanks rcoup for noticing this 2009-03-09 04:59:23 +00:00
Dane Springmeyer
fd50ef8400 scons: force configure stage if the user supplies commandline arguments, and make sure not to save out custom variables for gdal and postgres if the config failed 2009-03-09 04:45:09 +00:00
Dane Springmeyer
9cf64111c2 scons: fix brain fade - need to return gdal lib name to populate env['LIBS'] if gdal libname is successfully parsed 2009-03-09 00:27:06 +00:00
Dane Springmeyer
3f8b646289 scons: remove accidentally added pdb trace 2009-03-06 17:02:39 +00:00
Dane Springmeyer
5c426d08f9 scons: add postgres lib manually after switch to using pg_config for libs and includes (nice catch podolsir) 2009-03-06 16:12:39 +00:00
Dane Springmeyer
f50f908546 scons: fix typo 2009-03-04 06:31:36 +00:00
Dane Springmeyer
727b2ee9b9 scons: add fallback for contructing python install environment if distutils is not available 2009-03-04 05:11:21 +00:00
Dane Springmeyer
c6a48bfdb2 scons: add the paths specified for ICU_LIBS/INCLUDES 2009-03-04 01:50:19 +00:00
Dane Springmeyer
fa5a2195d7 scons: add boolean options to build the rundemo and pgsql2sqlite programs - off by default 2009-03-03 19:31:05 +00:00
Dane Springmeyer
8f56b0d5dc scons: warn if the SYSTEM_FONTS directory does not exist 2009-03-02 23:53:28 +00:00
Dane Springmeyer
fb1def644b scons: fix up handling of plugin dependencies by making optional but warning after configure if not found 2009-03-01 06:45:59 +00:00
Dane Springmeyer
0ec29dfe3b scons: typo fix 2009-03-01 00:03:50 +00:00
Dane Springmeyer
67fe8b2c34 scons: switch to regex to find and parse the (potentially custom) gdal libname from gdal-config - this is specifically to support debian naming of gdal pkgs 2009-02-28 23:55:03 +00:00
Dane Springmeyer
2399d61c4b scons: gdal-config does not predicatably return config arguments when multiple are requested, so call twice 2009-02-28 22:22:48 +00:00
Dane Springmeyer
383ef59289 scons: switch to using pg_config and gdal-config for checking and adding libs using reworked config parsing that also applies to xml2-config and freetype-config 2009-02-28 21:18:32 +00:00
Dane Springmeyer
9f40e90def scons: move all configure options to 'scons configure' stage, using pickling to maintain configure options across builds 2009-02-26 23:35:09 +00:00
Dane Springmeyer
df8beaa952 scons: cleanup unneeded thread_flag check in Boost lib/header checking 2009-02-25 23:01:50 +00:00
Dane Springmeyer
6d0ac8f05b scons: trivial formatting fixes to SConstruct to maintain 4 space indents 2009-02-25 22:56:47 +00:00
Dane Springmeyer
7a7362751d scons: improve handling of optional plugin paths by only adding paths if a plugin will be built, prepending plugin paths to ensure linking against requested libs, and maintaining sorting of internal includes and libs given new plugin prepend behavior (addresses #250) 2009-02-25 21:18:08 +00:00
Dane Springmeyer
46df10d7d0 scons: add boolean option to avoid linking to Framework Python on darwin (closes #248) 2009-02-25 01:02:43 +00:00
Dane Springmeyer
feb3f3327c scons:reformat the custom boost and mapnik version checking cpp snippets, since on gcc 4.1.1 the existing formatting was causing 'no newline at end of file' warnings 2009-02-24 18:05:22 +00:00
Dane Springmeyer
90f3703505 scons: add option called 'LIB_DIR_NAME' to control the relative directory where input plugins are installed and where python looks to register them 2009-02-23 00:47:01 +00:00
Dane Springmeyer
42be8116e1 scons: add a SYSTEM_FONTS variable to avoid installation of bundled dejavu fonts and instead point Python bindings at given value - also print SCONS_LOCAL_CONFIG values for user during configure 2009-02-20 19:31:08 +00:00
Dane Springmeyer
901223ef25 scons: move the mapnik version checking later in script, after local paths have been added 2009-02-17 22:48:17 +00:00
Dane Springmeyer
75687151e8 scons: make sure to return 0 to keep linux happy 2009-02-17 22:41:35 +00:00
Dane Springmeyer
346ac28947 scons: make sure to check for boost_python (closes #229), improve checking of boost version (closes #236), and fetch ABI version from mapnik/version (closes #72), as well as adding PathAccept for all PathVariables to account for various 64bit systems. 2009-02-17 20:31:04 +00:00
Dane Springmeyer
068e7a0ee7 scons: remove unneeded paths for plugins not found or tinyxml if not requested (closed #222, furthers #220) 2009-02-12 19:42:52 +00:00
Dane Springmeyer
ffd02e7c99 + Add SCons build script for osm plugin 2009-02-10 20:25:33 +00:00
Dane Springmeyer
1f5edf45f0 scons: Use implicit caching of deps if SCONS_CACHE is requested which should double or triple the speed at which the 'scons: Building targets ...' step will run. Hint: use the --implicit-deps-unchanged flag for even quicker target checking 2009-02-10 17:59:49 +00:00
Artem Pavlenko
ca0502eaaf + reverting back accidental change 2009-02-09 20:44:06 +00:00
Artem Pavlenko
7d2f492ef2 + sqlite-input-plugin.patch (kunitoki) 
+ wkb-sqlite.patch (kunitoki)
+ very preliminary spatial index support (idx_<tablename>_<geometry_field>)
 2009-02-09 19:43:57 +00:00
Dane Springmeyer
d62fe5eb1a Scons: refine the usage of distutils by respecting site-packages location for specific arch's, use the get_python_version() helper, and normpath() to avoid double '/' - addresses #219 and furthers #209 2009-02-07 16:57:42 +00:00
Jon Burgess
6ced52bedf Guard against missing paths. Fixes #220. 2009-02-07 11:12:38 +00:00
Artem Pavlenko
c3ff9c842d + scons_python_usability_improvements2 (springmeyer) 2009-02-03 23:00:03 +00:00
Dane Springmeyer
e7adc3b8ba Fixed typo 2009-02-03 21:20:09 +00:00
Dane Springmeyer
54334dbbb5 + scons: work towards more modular lists of which plugins to build, and switch new occi plugin lib names - revised commit based on #213 2009-02-03 21:14:45 +00:00
Dane Springmeyer
72ff58ab57 Remove gigabase reference - not an active plugin 2009-02-03 17:07:40 +00:00
Dane Springmeyer
fbe4c41700 + apply patch for Oracle 10g support from kunitoki - see #212 2009-02-03 17:06:23 +00:00
Dane Springmeyer
5f0385b80a Make true boolean whether we save and read from user 'config.py' file, and clean up messages 2009-01-30 23:08:25 +00:00
Dane Springmeyer
f414843c4f + First implementation of OGR(vector) input plugin. Patch from kunitoki. Thanks! Closes #170 2009-01-28 20:16:31 +00:00
Dane Springmeyer
4009c31649 SCons: When configure fails print message about looking in the 'config.log' 2009-01-27 20:25:27 +00:00
Dane Springmeyer
07c94a1acc + fix typos in SConstruct 2009-01-27 01:34:22 +00:00
Artem Pavlenko
e7014c2b7e + SCons_usabilty_improvements2.patch (springmeyer) 
(see #186 ticket for details)
 2009-01-26 22:58:55 +00:00
Artem Pavlenko
cca28d702f + issue a warning if boost_program_options is not available 2009-01-19 23:12:19 +00:00
Artem Pavlenko
3199a49d2d + applied mapnik-improve-scons-search-paths.patch (jonb) 2009-01-15 22:37:07 +00:00
Artem Pavlenko
d8226945d4 + improved pkg-config logic 2009-01-10 12:08:55 +00:00
Artem Pavlenko
8687dd795d + Scons updated to latest stable version 1.2 2009-01-06 10:52:43 +00:00
Artem Pavlenko
48a13f8cbc appled boost_append_osx_patch_v3 from jbronn 2008-12-04 23:20:44 +00:00
Artem Pavlenko
df8cfcab03 + fixed building with boost-1_36 
+ corrected order of BOOST_TOOLKIT 
(create symlinks on OSX + boost-1_35)
 2008-10-08 06:30:38 +00:00
Tom Hughes
6472af9289 Add an INTERNAL_LIBAGG build option that can be used to make mapnik 
build against the system libagg instead of mapnik's copy.
 2008-07-29 18:35:27 +00:00
Tom Hughes
08aae2622f Make boost_system optional as boost before 1.35.0 doesn't have it and 
mapnik seems to compile fine without it.
 2008-07-29 08:07:02 +00:00
Artem Pavlenko
fe31150a7b corrected boost libs names logic 2008-06-29 11:40:35 +00:00
Artem Pavlenko
3f9127b5d0 reverting back to 700 2008-06-29 10:58:29 +00:00
Artem Pavlenko
3275cf9ce6 applied font fallbacj patch from Beau Gunderson 2008-06-29 10:40:08 +00:00
Dominic Hargreaves
6e360f0090 ppc64 build fix (fixes #83) 2008-03-29 01:01:12 +00:00
Tom Hughes
2f67c036fe Make cairo components conditional on the relevant libaries etc existing. 2008-03-12 19:14:51 +00:00
Tom Hughes
02962156c5 Add support for rendering to a cairo surface. 2008-02-23 00:17:53 +00:00
Artem Pavlenko
308e315432 added Unicode support based on ICU 2008-02-18 21:40:34 +00:00
Artem Pavlenko
a8e2821885 support building multi/single variants 2008-02-04 16:14:05 +00:00
Artem Pavlenko
a8859645b3 use memory mapped files for reading shape files 2008-02-04 11:12:32 +00:00
Artem Pavlenko
3c5b7f02f3 applied freebsd patch from Beau Gunderson 2008-01-28 14:51:10 +00:00
Artem Pavlenko
3d9024ddc4 make iconv check optional 2008-01-23 21:06:28 +00:00
Artem Pavlenko
df643baa54 added missing PGSQL 2008-01-21 20:56:31 +00:00
Artem Pavlenko
2b60d6d425 applied patch to build on OSX Leopard and Sun's C++ compiler on Solaris from Justin Bronn 2008-01-21 20:15:07 +00:00
Artem Pavlenko
747ef8cccf added a bit of colour to SCons 2008-01-03 11:41:39 +00:00
Artem Pavlenko
04686f7b28 removed GIGABASE stuff as it's unused at the moment 2007-12-06 12:11:17 +00:00
Artem Pavlenko
6d83b199a4 comment out boost_system 2007-10-05 11:29:55 +00:00
Artem Pavlenko
d1a345a3d2 1.don't share FT_Library object between threads (TODO : implement freetype_engine pool) 
2. merged changes with latest load_map
 2007-10-05 11:27:00 +00:00
David
b2df387a9d - merged strict-xml-branch r530:532 to trunk: 
- libxml2 support
    - strict error handling while parsing XML map files
    - implemented save_map()
    - removed some duplicate defaults
    - all symbolizers with icons share a common base class now
 2007-09-25 18:47:12 +00:00
Artem Pavlenko
bb9f426dd9 don't check for boost_system by default 2007-09-18 10:54:44 +00:00
Artem Pavlenko
8e071f84c7 1. Changed internal geometry representation (explicit support for multi geometries) 
(FIXME : label_spacing is still, too slow!!) 
2. Re-use some agg objects.
3. placement_finder cleanups! 
4. Added support for 'building_symbolizer' - extruded polygons
 2007-09-16 11:23:51 +00:00
Artem Pavlenko
76572994b5 Applied mapnik-r511.patch from David Siegel: 
plugins/input/postgis/SConscript:
- added boost_thread-mt to darwin builds

demo/c++/rundemo.cpp:
- setBackground() is now set_background()

bindings/python/SConscript:
- added boost_thread-mt to darwin builds
- changed builder to LoadableModule which builds a so called "bundle"
   on darwin and a shared library on all other systems.
- LDMODULEPREFIX = '' 

SConstruct:
- freetype-config is now searched in the path.
 2007-08-28 10:12:38 +00:00
Artem Pavlenko
c44cbddea7 applied mapnik-gdal-libs.patch from jonb 2007-05-20 20:19:04 +00:00
Artem Pavlenko
7e38fc3d67 added support for building gdal plug-in 2007-04-25 19:18:44 +00:00
Artem Pavlenko
8b74a301fb Be explicit about threading model 
Added THREADING enum options (defaults to 'multi')
 2007-03-22 10:54:44 +00:00
Artem Pavlenko
67c09a815b corrected boost toolkit/append logic 2007-03-16 12:09:58 +00:00
Artem Pavlenko
528002dc82 added missing -pthread for linux platforms 2007-03-16 10:20:52 +00:00
Artem Pavlenko
e0d243dcec 1.Added support for building on Darwin (Xcode 2.4.1, gcc4.0.1). 
Mainly taming gcc4.0.1 (anonymous enum bug)

2.Input plug-ins now have .input extension on all platforms
 2007-03-16 10:11:37 +00:00