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

174 commits

Author SHA1 Message Date
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