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

install mapbox includes into subdir mapnik/deps/

Browse source
This commit is contained in:
Mickey Rose 2019-09-20 20:15:53 +02:00
parent cea7821722
commit d1697efe6d
4 changed files with 29 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
SConstruct
View file

@ -2170,9 +2170,6 @@ if not HELP_REQUESTED:
# Install headers # Install headers
SConscript('include/build.py') SConscript('include/build.py')
# Install auxiliary headers
SConscript('deps/mapnik/build.py')
# Build the requested and able-to-be-compiled input plug-ins # Build the requested and able-to-be-compiled input plug-ins
GDAL_BUILT = False GDAL_BUILT = False
OGR_BUILT = False OGR_BUILT = False

20
deps/mapnik/build.py vendored
View file

@ -1,20 +0,0 @@
import os
from glob import glob
Import('env')
subdirs = {
'./sparsehash':{'dir':'sparsehash','glob':'*'},
'./sparsehash/internal':{'dir':'sparsehash/internal','glob':'*'},
'../agg/include':{'dir':'agg','glob':'agg*'},
'../mapbox/variant/include':{'dir':'mapbox','glob':'*/*.hpp'},
'../mapbox/geometry/include':{'dir':'mapbox','glob':'*/*.hpp'},
'../mapbox/geometry/include/mapbox':{'dir':'mapbox/geometry','glob':'*/*.hpp'}
}
if 'install' in COMMAND_LINE_TARGETS:
for k,v in subdirs.items():
pathdir = os.path.join(k,v['glob'])
includes = glob(pathdir)
inc_target = os.path.normpath(env['INSTALL_PREFIX']+'/include/mapnik/'+v['dir'])
env.Alias(target='install', source=env.Install(inc_target, includes))

53
include/build.py
View file

@ -24,37 +24,40 @@ from glob import glob
Import('env') Import('env')
base = './mapnik/' subdirglobs = [
subdirs = [ ('.', 'mapnik/*.hpp'),
'', ('agg', '../deps/agg/include/agg*'),
'geometry', ('cairo', 'mapnik/cairo/*.hpp'),
'csv', ('csv', 'mapnik/csv/*.hpp'),
'svg', ('deps/mapbox', '../deps/mapbox/variant/include/mapbox/*.hpp'),
'wkt', ('deps/mapbox', '../deps/mapbox/geometry/include/mapbox/*.hpp'),
'cairo', ('deps/mapbox/geometry', '../deps/mapbox/geometry/include/mapbox/geometry/*.hpp'),
'grid', ('geometry', 'mapnik/geometry/*.hpp'),
'json', ('group', 'mapnik/group/*.hpp'),
'util', ('json', 'mapnik/json/*.hpp'),
'group', ('markers_placements', 'mapnik/markers_placements/*.hpp'),
'text', ('renderer_common', 'mapnik/renderer_common/*.hpp'),
'text/placements', ('sparsehash', '../deps/mapnik/sparsehash/*'),
'text/formatting', ('sparsehash/internal', '../deps/mapnik/sparsehash/internal/*'),
'transform', ('svg', 'mapnik/svg/*.hpp'),
'markers_placements', ('text', 'mapnik/text/*.hpp'),
'geometry', ('text/formatting', 'mapnik/text/formatting/*.hpp'),
'value' ('text/placements', 'mapnik/text/placements/*.hpp'),
] ('transform', 'mapnik/transform/*.hpp'),
('util', 'mapnik/util/*.hpp'),
('value', 'mapnik/value/*.hpp'),
('wkt', 'mapnik/wkt/*.hpp'),
]
if env['SVG_RENDERER']: if env['SVG_RENDERER']:
subdirs.append('svg/output') subdirglobs.append(('svg/output', 'mapnik/svg/output/*.hpp'))
if env['GRID_RENDERER']: if env['GRID_RENDERER']:
subdirs.append('grid') subdirglobs.append(('grid', 'mapnik/grid/*.hpp'))
if 'install' in COMMAND_LINE_TARGETS: if 'install' in COMMAND_LINE_TARGETS:
for subdir in subdirs: for subdir, filenamepattern in subdirglobs:
pathdir = os.path.join(base,subdir,'*.hpp') includes = glob(filenamepattern)
includes = glob(pathdir)
inc_target = os.path.normpath(env['INSTALL_PREFIX']+'/include/mapnik/'+subdir) inc_target = os.path.normpath(env['INSTALL_PREFIX']+'/include/mapnik/'+subdir)
env.Alias(target='install', source=env.Install(inc_target, includes)) env.Alias(target='install', source=env.Install(inc_target, includes))

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

@ -32,7 +32,7 @@ CONFIG_QUERIED_ICU_DATA=
## D.R.Y. variables ## D.R.Y. variables
DRY_INCLUDES="-I${RUNTIME_PREFIX}/include -I${RUNTIME_PREFIX}/include/mapnik/agg -I${RUNTIME_PREFIX}/include/mapnik" DRY_INCLUDES="-I${RUNTIME_PREFIX}/include -I${RUNTIME_PREFIX}/include/mapnik/agg -I${RUNTIME_PREFIX}/include/mapnik/deps"
DRY_CFLAGS="${DRY_INCLUDES} ${CONFIG_DEP_INCLUDES} ${CONFIG_DEFINES} ${CONFIG_CXXFLAGS}" DRY_CFLAGS="${DRY_INCLUDES} ${CONFIG_DEP_INCLUDES} ${CONFIG_DEFINES} ${CONFIG_CXXFLAGS}"
DRY_LIBS="-L${RUNTIME_PREFIX}/${CONFIG_LIBDIR_SCHEMA} -l${CONFIG_MAPNIK_NAME}" DRY_LIBS="-L${RUNTIME_PREFIX}/${CONFIG_LIBDIR_SCHEMA} -l${CONFIG_MAPNIK_NAME}"