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

simplify and install mapnik wkt and json libs

Browse source
This commit is contained in:
Dane Springmeyer 2014-10-22 00:09:22 -07:00
parent 46a41f3ae1
commit ca3078938c
6 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
bindings/python/build.py
View file

@ -183,18 +183,14 @@ if 'uninstall' not in COMMAND_LINE_TARGETS:
py_env.Append(CPPDEFINES = '-DHAVE_PYCAIRO')
py_env.Append(LINKFLAGS=python_link_flag)
py_env.AppendUnique(LIBS='mapnik_json_geometry_grammar')
py_env.AppendUnique(LIBS='mapnik_json_feature_grammar')
py_env.AppendUnique(LIBS='mapnik_json_generator_grammar')
py_env.AppendUnique(LIBS='mapnik_wkt_generator_grammar')
py_env.AppendUnique(LIBS='mapnik_wkt_grammar')
py_env.AppendUnique(LIBS='mapnik-json')
py_env.AppendUnique(LIBS='mapnik-wkt')
_mapnik = py_env.LoadableModule('mapnik/_mapnik', sources, LDMODULEPREFIX='', LDMODULESUFFIX='.so')
Depends(_mapnik, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME']))
Depends(_mapnik, env.subst('../../src/json/libmapnik_json_geometry_grammar${LIBSUFFIX}'))
Depends(_mapnik, env.subst('../../src/json/libmapnik_json_feature_grammar${LIBSUFFIX}'))
Depends(_mapnik, env.subst('../../src/json/libmapnik_json_generator_grammar${LIBSUFFIX}'))
Depends(_mapnik, env.subst('../../src/json/libmapnik-json${LIBSUFFIX}'))
Depends(_mapnik, env.subst('../../src/wkt/libmapnik-wkt${LIBSUFFIX}'))
if env['PLATFORM'] == 'SunOS' and env['PYTHON_IS_64BIT']:
# http://mail.python.org/pipermail/python-dev/2006-August/068528.html

8
plugins/input/csv/build.py
View file

@ -37,8 +37,8 @@ plugin_sources = Split(
libraries = []
libraries.append('boost_system%s' % env['BOOST_APPEND'])
libraries.append(env['ICU_LIB_NAME'])
libraries.append('mapnik_json_geometry_grammar')
libraries.append('mapnik_wkt_grammar')
libraries.append('mapnik-json')
libraries.append('mapnik-wkt')
if env['PLUGIN_LINKING'] == 'shared':
libraries.append(env['MAPNIK_NAME'])
@ -51,8 +51,8 @@ if env['PLUGIN_LINKING'] == 'shared':
# if the plugin links to libmapnik ensure it is built first
Depends(TARGET, env.subst('../../../src/%s' % env['MAPNIK_LIB_NAME']))
Depends(TARGET, env.subst('../../../src/json/libmapnik_json_geometry_grammar${LIBSUFFIX}'))
Depends(TARGET, env.subst('../../../src/wkt/libmapnik_wkt_grammar${LIBSUFFIX}'))
Depends(TARGET, env.subst('../../../src/json/libmapnik-json${LIBSUFFIX}'))
Depends(TARGET, env.subst('../../../src/wkt/libmapnik-wkt${LIBSUFFIX}'))
if 'uninstall' not in COMMAND_LINE_TARGETS:
env.Install(env['MAPNIK_INPUT_PLUGINS_DEST'], TARGET)

8
plugins/input/geojson/build.py
View file

@ -38,9 +38,7 @@ plugin_sources = Split(
libraries = []
libraries.append(env['ICU_LIB_NAME'])
libraries.append('boost_system%s' % env['BOOST_APPEND'])
libraries.append('mapnik_json_feature_collection_grammar')
libraries.append('mapnik_json_feature_grammar')
libraries.append('mapnik_json_geometry_grammar')
libraries.append('mapnik-json')
if env['PLUGIN_LINKING'] == 'shared':
libraries.append(env['MAPNIK_NAME'])
@ -53,9 +51,7 @@ if env['PLUGIN_LINKING'] == 'shared':
# if the plugin links to libmapnik ensure it is built first
Depends(TARGET, env.subst('../../../src/%s' % env['MAPNIK_LIB_NAME']))
Depends(TARGET, env.subst('../../../src/json/libmapnik_json_geometry_grammar${LIBSUFFIX}'))
Depends(TARGET, env.subst('../../../src/json/libmapnik_json_feature_grammar${LIBSUFFIX}'))
Depends(TARGET, env.subst('../../../src/json/libmapnik_json_feature_collection_grammar${LIBSUFFIX}'))
Depends(TARGET, env.subst('../../../src/json/libmapnik-json${LIBSUFFIX}'))
if 'uninstall' not in COMMAND_LINE_TARGETS:
env.Install(env['MAPNIK_INPUT_PLUGINS_DEST'], TARGET)

4
plugins/input/topojson/build.py
View file

@ -38,7 +38,7 @@ plugin_sources = Split(
libraries = []
libraries.append(env['ICU_LIB_NAME'])
libraries.append('boost_system%s' % env['BOOST_APPEND'])
libraries.append('mapnik_topojson_grammar')
libraries.append('mapnik-json')
if env['PLUGIN_LINKING'] == 'shared':
libraries.append(env['MAPNIK_NAME'])
@ -51,7 +51,7 @@ if env['PLUGIN_LINKING'] == 'shared':
# if the plugin links to libmapnik ensure it is built first
Depends(TARGET, env.subst('../../../src/%s' % env['MAPNIK_LIB_NAME']))
Depends(TARGET, env.subst('../../../src/json/libmapnik_topojson_grammar${LIBSUFFIX}'))
Depends(TARGET, env.subst('../../../src/json/libmapnik-json${LIBSUFFIX}'))
if 'uninstall' not in COMMAND_LINE_TARGETS:
env.Install(env['MAPNIK_INPUT_PLUGINS_DEST'], TARGET)

9
src/json/build.py
View file

@ -26,5 +26,10 @@ Import('env')
lib_env = env.Clone()
if 'g++' in env['CXX']:
lib_env.Append(CXXFLAGS='-fPIC')
for file in glob('./' + '*.cpp'):
lib_env.StaticLibrary(file.replace('.cpp',''), file, LIBS=[])
name = "mapnik-json"
lib = lib_env.StaticLibrary(name, glob('./' + '*.cpp'), LIBS=[])
target = os.path.join(env['MAPNIK_LIB_BASE_DEST'], env.subst('${LIBPREFIX}%s${LIBSUFFIX}' % name))
result = env.InstallAs(target=target, source=lib)
env.Alias(target='install', source=result)
env['create_uninstall_target'](env, target)

9
src/wkt/build.py
View file

@ -26,5 +26,10 @@ Import('env')
lib_env = env.Clone()
if 'g++' in env['CXX']:
lib_env.Append(CXXFLAGS='-fPIC')
for file in glob('./' + '*.cpp'):
lib_env.StaticLibrary(file.replace('.cpp',''), file, LIBS=[])
name = "mapnik-wkt"
lib = lib_env.StaticLibrary(name, glob('./' + '*.cpp'), LIBS=[])
target = os.path.join(env['MAPNIK_LIB_BASE_DEST'], env.subst('${LIBPREFIX}%s${LIBSUFFIX}' % name))
result = env.InstallAs(target=target, source=lib)
env.Alias(target='install', source=result)
env['create_uninstall_target'](env, target)