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

84 commits

Author SHA1 Message Date
Mathis Logemann
dea63374f4 [CMake] better logging of feature options. Output log files for better help management. ; get started with mapnik-config 2021-10-10 21:34:15 +02:00
Mickey Rose
39202f5ac0 mapnik-config: fix substitution of environment variables 
Simply calling str(val) doesn't work, because if the value happens to
be a SCons.Util.CLVar, it may contain not just plain strings, but also
tuples appended by SCons.Environment.ParseFlags.

For example "-isysroot /foo" becomes CLVar: [("-isysroot", "/foo")]

CLVar.__str__ supports only string elements, nothing else.
 2020-01-30 15:15:14 +01:00
Mickey Rose
d1697efe6d install mapbox includes into subdir mapnik/deps/ 2019-09-20 20:15:53 +02:00
Mickey Rose
2dcb31cd01 mapnik-config: minor cleanup 2019-09-16 23:30:01 +02:00
Mickey Rose
a3086c06a5 mapnik-config: improve mapnik-config.template.sh 
- move template text from build.py into mapnik-config.template.sh,
  so that the resulting script is simply that template file after
  substitutions, instead of concatenation of two parts

- substitute using re.sub matching particular variables, instead of
  format % dict; this allows putting default values in the template
 2019-09-16 23:17:09 +02:00
Mickey Rose
c61d0d541d Revert "Forgot to add prefix change to mapnik config to cairo as well" 
This reverts commit a9712ed081.
 2019-09-15 12:30:37 +02:00
Mickey Rose
297126906d Revert "Added an update to mapnik config so that it can provide relative path to libraries better in node mapnik." 
This reverts commit a4aee2eb59.
 2019-09-15 12:30:28 +02:00
Artem Pavlenko
5732df452c support SCons 3 (initial attempt) 2017-11-16 11:59:55 +01:00
Dane Springmeyer
8689048ba6 port #3759 to master 2017-09-10 08:19:04 -07:00
Bas Couwenberg
01699fe81e Fix 'depedencies' typo, replace with 'dependencies'. 2016-10-15 20:07:52 +02:00
Dane Springmeyer
02c2338c43 mapnik-config: strip clang specific warning flags 2016-08-31 11:09:11 -07:00
Dane Springmeyer
087add2c71 Remove MAPNIK_BUNDLED_SHARE_DIRECTORY build option 
- this was intended to be used by python-mapnik
 - but it is not currently, so let's clean it up
 - todo: get actual ICU_DATA,PROJ_LIB,GDAL_DATA values from those depependent libs
 2016-03-16 13:48:26 -07:00
Dane Springmeyer
03285f60b0 install mapbox variant - followup to #3236 2016-01-14 14:09:32 -08:00
Dane Springmeyer
a326cff744 ensure mapnik-config is rebuilt if version.hpp changes 2015-10-12 13:42:08 -07:00
artemp
8c6bf0eef6 update copyright notice 2015-06-16 12:49:16 +02:00
Blake Thompson
a9712ed081 Forgot to add prefix change to mapnik config to cairo as well 2015-06-15 16:25:59 -05:00
Blake Thompson
a4aee2eb59 Added an update to mapnik config so that it can provide relative path to libraries better in node mapnik. 2015-06-15 15:37:23 -05:00
Paul Norman
eeec7850d0 Don't hard-code bash path in mapnik-config 
[[ is a bashism, so this script needs bash, but shouldn't assume a location.
 2015-05-24 13:16:31 -07:00
Dane Springmeyer
2de1805aa3 make mapnik-config able to report relative paths to share/ data 2015-04-27 16:02:41 -07:00
Dane Springmeyer
2ce6a317dd better defaults for git metadata 2014-10-23 01:00:35 -07:00
Dane Springmeyer
036a3bb14f only report git metadata for git checkout builds 2014-10-23 00:42:10 -07:00
Dane Springmeyer
a0dc3df575 move mapnik-config back to utils/ 2014-10-22 23:46:33 -07:00
Dane Springmeyer
66347f78e6 rework tests: always run locally 2013-11-22 12:01:02 -08:00
Dane Springmeyer
08fa9fd8ec Merge branch '2.3.x' of github.com:mapnik/mapnik 
Conflicts:
	bindings/python/mapnik_building_symbolizer.cpp
	bindings/python/mapnik_debug_symbolizer.cpp
	bindings/python/mapnik_line_pattern_symbolizer.cpp
	bindings/python/mapnik_line_symbolizer.cpp
	bindings/python/mapnik_markers_symbolizer.cpp
	bindings/python/mapnik_point_symbolizer.cpp
	bindings/python/mapnik_polygon_symbolizer.cpp
	bindings/python/mapnik_python.cpp
	bindings/python/mapnik_raster_symbolizer.cpp
	bindings/python/mapnik_shield_symbolizer.cpp
	bindings/python/mapnik_symbolizer.cpp
 2013-11-07 09:21:05 -08:00
Dane Springmeyer
d0619bc402 update copyright year for scons build files 2013-11-05 16:54:13 -08:00
Dane Springmeyer
710d558218 scons: simplify linkflags/ldflags setting / attempt to fix #2025 2013-10-22 16:35:46 -04:00
Dane Springmeyer
fe6d860fa4 remove mapnik-config.bat (for windows only) which is now versioned in mapnik-packaging repo: 173186c77b 2013-05-23 16:06:07 -07:00
Dane Springmeyer
47e62804be rundemo.gyp now working on windows 2013-05-23 00:46:55 -07:00
Dane Springmeyer
d5bf5e86c6 fix plugins and fonts path in mapnik-config.bat 2013-05-22 23:46:57 -07:00
Dane Springmeyer
019873a9d2 further fixes to mapnik-config.bat 2013-05-22 22:27:38 -07:00
Dane Springmeyer
a20adb86be add agg includes directory 2013-05-22 22:12:09 -07:00
Dane Springmeyer
fa7e4e2494 excape path separators to be more gyp friendly 2013-05-22 22:07:00 -07:00
Dane Springmeyer
00035b92d7 add static version of mapnik-config.bat for windows 2013-05-22 21:40:14 -07:00
Dane Springmeyer
bd3ba15638 improve reporting in mapnik-config of new options at 2.0.0 2013-05-21 14:09:49 -07:00
Dane Springmeyer
3fbf4df67d add support for statically linking datasource input plugins - closes #1810 and #1821 - refs #249 2013-05-16 11:55:58 -07:00
Dane Springmeyer
101ea276d1 add mapnik version number reporting to mapnik-config 2013-05-10 13:45:18 -07:00
Dane Springmeyer
55519212f7 add --all-flags to mapnik-config - closes #1839 2013-05-10 13:27:44 -07:00
Dane Springmeyer
7518c9c2c2 default to clang++ on OS X and start reporting CXX compiler used in mapnik-config - closes #1839 2013-05-10 13:24:41 -07:00
Dane Springmeyer
c55002e9b7 mapnik-config: start reporting dependency link flags again as they are needed to link command line apps (though not for bundles) 2013-04-10 17:05:33 -07:00
Dane Springmeyer
faa78864b6 mapnik-config also add cxxflags to cflags for full backwards compatibility with previous behavior 2013-03-19 00:15:04 -07:00
Dane Springmeyer
28d59decb8 mapnik-utils: make fonts/inputplugins actually relative and dynamically constructed if they can be 2013-03-15 13:31:10 -07:00
Dane Springmeyer
e2c7283522 Added new mapnik-config options: git-describe, defines, includes, dep-includes, and cxxflags - closes #1443 2013-03-13 19:49:59 -07:00
Dane Springmeyer
bdc262d711 remove old versioning strings 2013-03-13 13:06:10 -07:00
Dane Springmeyer
e703629b47 add --cflags - to make things will break without out - we can remove at 3.x 2013-03-02 23:17:03 -05:00
artemp
0745d07a79 + use cxxflags option 2013-02-27 10:01:39 -05:00
Dane Springmeyer
4543032a0d fix dynamic prefix detection on linux - closes #1701 2013-01-25 01:18:29 -08:00
Dane Springmeyer
6f91aaa77d supress ldflags and dep-libs in mapnik-config if we are statically linking deps 2013-01-23 22:00:25 -08:00
Dane Springmeyer
98a145acd0 avoid hardcoding prefix that mapnik-config knows about and rather determine on the fly based on where it is installed (helps with package building and should be harmless otherwise) 2013-01-23 21:58:04 -08:00
Dane Springmeyer
94ff584190 finish complete removal of any trace of cairomm/libsigc++ - amends f25d4d9279 and closes #1681 2013-01-09 12:49:39 -08:00
Dane Springmeyer
a56c63bed1 start installing agg headers so that c++ programs using mapnik can use more of the mapnik api - closes #1383 2012-08-27 18:45:04 -07:00