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