sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mapnik-utils: make fonts/inputplugins actually relative and dynamically constructed if they can be

Browse source
This commit is contained in:
Dane Springmeyer 2013-03-15 13:31:10 -07:00
parent c81f28fc41
commit 28d59decb8
2 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
utils/mapnik-config/build.py
View file

@ -17,15 +17,16 @@ config_variables = '''#!/bin/sh
## variables ## variables
CONFIG_PREFIX="$( cd "$( dirname $( dirname "$0" ))" && pwd )"
CONFIG_MAPNIK_VERSION='%(version)s' CONFIG_MAPNIK_VERSION='%(version)s'
CONFIG_GIT_REVISION='%(git_revision)s' CONFIG_GIT_REVISION='%(git_revision)s'
CONFIG_GIT_DESCRIBE='%(git_describe)s' CONFIG_GIT_DESCRIBE='%(git_describe)s'
CONFIG_FONTS='%(fonts)s' CONFIG_FONTS="%(fonts)s"
CONFIG_INPUT_PLUGINS='%(input_plugins)s' CONFIG_INPUT_PLUGINS="%(input_plugins)s"
CONFIG_MAPNIK_DEFINES='%(defines)s' CONFIG_MAPNIK_DEFINES='%(defines)s'
CONFIG_PREFIX="$( cd "$( dirname $( dirname "$0" ))" && pwd )"
CONFIG_MAPNIK_LIBNAME='%(mapnik_libname)s' CONFIG_MAPNIK_LIBNAME='%(mapnik_libname)s'
CONFIG_MAPNIK_LIB="${CONFIG_PREFIX}/%(libdir_schema)s" CONFIG_MAPNIK_LIBPATH="%(mapnik_libpath)s"
CONFIG_DEP_LIBS='%(dep_libs)s' CONFIG_DEP_LIBS='%(dep_libs)s'
CONFIG_MAPNIK_LDFLAGS='%(ldflags)s' CONFIG_MAPNIK_LDFLAGS='%(ldflags)s'
CONFIG_MAPNIK_INCLUDE="${CONFIG_PREFIX}/include -I${CONFIG_PREFIX}/include/mapnik/agg" CONFIG_MAPNIK_INCLUDE="${CONFIG_PREFIX}/include -I${CONFIG_PREFIX}/include/mapnik/agg"
@ -82,17 +83,29 @@ else:
if not stderr: if not stderr:
git_describe = stdin.strip() git_describe = stdin.strip()
# for fonts and input plugins we should try
# to store the relative path, if feasible
fontspath = config_env['MAPNIK_FONTS']
lib_root = os.path.join(config_env['INSTALL_PREFIX'], config_env['LIBDIR_SCHEMA'])
if lib_root in fontspath:
fontspath = "${CONFIG_PREFIX}/" + os.path.relpath(fontspath,config_env['INSTALL_PREFIX'])
inputpluginspath = config_env['MAPNIK_INPUT_PLUGINS']
if lib_root in inputpluginspath:
inputpluginspath = "${CONFIG_PREFIX}/" + os.path.relpath(inputpluginspath,config_env['INSTALL_PREFIX'])
lib_path = "${CONFIG_PREFIX}/" + config_env['LIBDIR_SCHEMA']
configuration = { configuration = {
"git_revision": git_revision, "git_revision": git_revision,
"git_describe": git_describe, "git_describe": git_describe,
"version": config_env['MAPNIK_VERSION_STRING'], "version": config_env['MAPNIK_VERSION_STRING'],
"mapnik_libname": 'mapnik', "mapnik_libname": 'mapnik',
"libdir_schema": config_env['LIBDIR_SCHEMA'], "mapnik_libpath": lib_path,
"ldflags": ldflags, "ldflags": ldflags,
"dep_libs": dep_libs, "dep_libs": dep_libs,
"dep_includes": dep_includes, "dep_includes": dep_includes,
"fonts": config_env['MAPNIK_FONTS'], "fonts": fontspath,
"input_plugins": config_env['MAPNIK_INPUT_PLUGINS'], "input_plugins": inputpluginspath,
"defines":defines, "defines":defines,
"cxxflags":cxxflags "cxxflags":cxxflags
} }

2
utils/mapnik-config/mapnik-config.template.sh
View file

@ -86,7 +86,7 @@ while test $# -gt 0; do
;; ;;
--libs) --libs)
echo -L${CONFIG_MAPNIK_LIB} -l${CONFIG_MAPNIK_LIBNAME} echo -L${CONFIG_MAPNIK_LIBPATH} -l${CONFIG_MAPNIK_LIBNAME}
;; ;;
--dep-libs) --dep-libs)