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

172 commits

Author SHA1 Message Date
Dane Springmeyer
fd4ff876b6 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:33:45 +00:00
Dane Springmeyer
ffe5da46bd remove debugging line 2010-07-15 02:18:00 +00:00
Dane Springmeyer
22e6819272 scons: ensure pycairo headers are added 2010-07-15 02:17:30 +00:00
Dane Springmeyer
6097000322 scons: making sure things exist - prepping for out of source build 2010-07-15 00:39:07 +00:00
Dane Springmeyer
9a45c9d820 scons: better handling of PYTHON_INCLUDES and HAVE_LIBXML2 2010-07-15 00:20:38 +00:00
Dane Springmeyer
d75fb586d0 scons: only apply HAS_CAIRO & HAS_PYCAIRO flags to cairo related files 2010-07-14 22:46:37 +00:00
Dane Springmeyer
ebc3001890 scons: make sure to initialize cairo variables 2010-07-14 05:34:09 +00:00
Dane Springmeyer
fd8695c107 scons: conditionally add CXXFLAGS for headers needing Cairo support 2010-07-14 05:08:28 +00:00
Dane Springmeyer
f187cb7a12 backport for #257, and r1984 2010-07-14 01:02:01 +00:00
Dane Springmeyer
37f21f4289 scons: fixup logic for setting HAS_BOOST_SYSTEM SCons environment variable 2010-03-18 22:51:14 +00:00
Dane Springmeyer
5c0beb0151 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:27:36 +00:00
Dane Springmeyer
0356a8399e scons: fix subtle bug in scons usage resulting in lost paths on mac os x 2010-02-22 23:50:16 +00:00
Dane Springmeyer
d093166b4a check for both 'debian' and 'Ubuntu' to figure out lib schema 2010-02-22 19:50:09 +00:00
Dane Springmeyer
cd2cd2ba51 don't install by default in lib64 on debian systems - closes #394 2010-02-22 16:46:28 +00:00
Dane Springmeyer
25dd583d6e remove print statement 2010-02-21 01:00:36 +00:00
Dane Springmeyer
fedbc40541 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 00:33:41 +00:00
Dane Springmeyer
3a80dffb6e bump version to 0.7.1, merge r1596,r1604,r1605,r1625, and fix #512 and #504 2010-02-19 19:11:17 +00:00
Dane Springmeyer
42249704d7 increment abi versions to 0.7.0 2010-01-11 01:28:42 +00:00
Dane Springmeyer
2484e818b8 scons: support py3k in python configuration detection 2010-01-07 17:14:39 +00:00
Dane Springmeyer
b64fb713f3 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:27:13 +00:00
Dane Springmeyer
cabdd341cd merge r1496 from trunk into 0.7 branch 2009-12-16 22:28:33 +00:00
Dane Springmeyer
354bdbd15a fix small bug in FindBoost implementation and expose ability to specify a custom library path or library name for boost_python as various packaging systems on debian are using new suffixes to support two versions of python and we need an easy way to point boost specifically at these libraries - closes #351 2009-12-15 19:17:41 +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