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 |
|