Commit graph

130 commits

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