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

scons: minor touchups to plugin reporting

Browse source
This commit is contained in:
Dane Springmeyer 2010-12-21 20:34:36 +00:00
parent 331143c3fe
commit dbfd287098
1 changed files with 42 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
SConstruct
View file

@ -364,7 +364,7 @@ opts.AddVariables(
# variables to pickle after successful configure step # variables to pickle after successful configure step
# these include all scons core variables as well as custom # these include all scons core variables as well as custom
# env variables needed in Sconscript files # env variables needed in SConscript files
pickle_store = [# Scons internal variables pickle_store = [# Scons internal variables
'CC', # compiler user to check if c deps compile during configure 'CC', # compiler user to check if c deps compile during configure
'CXX', # C++ compiler to compile mapnik 'CXX', # C++ compiler to compile mapnik
@ -751,13 +751,13 @@ int main()
""", '.cpp') """, '.cpp')
# hack to avoid printed output # hack to avoid printed output
context.Message('Checking for ICU version >= 4.2... ') context.Message('Checking for ICU version >= 4.2... ')
#context.did_show_result=1 context.did_show_result=1
result = ret[1].strip() result = ret[1].strip()
if not result: if not result:
context.Result('error, could not get major and minor version from unicode/uversion.h') context.Result('error, could not get major and minor version from unicode/uversion.h')
return False return False
color_print(4,'\nFound icu version... %s' % result) color_print(4,'\nFound icu version... %s\n' % result)
major, minor = map(int,result.split('.')) major, minor = map(int,result.split('.'))
if major >= 4 and minor >= 2: if major >= 4 and minor >= 2:
return True return True
@ -996,45 +996,46 @@ if not preconfigured:
env['REQUESTED_PLUGINS'] = [ driver.strip() for driver in Split(env['INPUT_PLUGINS'])] env['REQUESTED_PLUGINS'] = [ driver.strip() for driver in Split(env['INPUT_PLUGINS'])]
color_print(4,'Checking for requested plugins dependencies...') if len(env['REQUESTED_PLUGINS']):
for plugin in env['REQUESTED_PLUGINS']: color_print(4,'Checking for requested plugins dependencies...')
details = env['PLUGINS'][plugin] for plugin in env['REQUESTED_PLUGINS']:
if plugin == 'gdal': details = env['PLUGINS'][plugin]
if conf.parse_config('GDAL_CONFIG',checks='--libs'): if plugin == 'gdal':
conf.parse_config('GDAL_CONFIG',checks='--cflags') if conf.parse_config('GDAL_CONFIG',checks='--libs'):
libname = conf.get_pkg_lib('GDAL_CONFIG','gdal')
if libname:
details['lib'] = libname
elif plugin == 'postgis':
conf.parse_pg_config('PG_CONFIG')
elif plugin == 'ogr':
if conf.ogr_enabled():
if not 'gdal' in env['REQUESTED_PLUGINS']:
conf.parse_config('GDAL_CONFIG',checks='--libs')
conf.parse_config('GDAL_CONFIG',checks='--cflags') conf.parse_config('GDAL_CONFIG',checks='--cflags')
libname = conf.get_pkg_lib('GDAL_CONFIG','ogr') libname = conf.get_pkg_lib('GDAL_CONFIG','gdal')
if libname: if libname:
details['lib'] = libname details['lib'] = libname
elif plugin == 'postgis':
elif details['path'] and details['lib'] and details['inc']: conf.parse_pg_config('PG_CONFIG')
backup = env.Clone().Dictionary() elif plugin == 'ogr':
# Note, the 'delete_existing' keyword makes sure that these paths are prepended if conf.ogr_enabled():
# to the beginning of the path list even if they already exist if not 'gdal' in env['REQUESTED_PLUGINS']:
incpath = env['%s_INCLUDES' % details['path']] conf.parse_config('GDAL_CONFIG',checks='--libs')
env.PrependUnique(CPPPATH = incpath,delete_existing=True) conf.parse_config('GDAL_CONFIG',checks='--cflags')
env.PrependUnique(LIBPATH = env['%s_LIBS' % details['path']],delete_existing=True) libname = conf.get_pkg_lib('GDAL_CONFIG','ogr')
if not conf.CheckLibWithHeader(details['lib'], details['inc'], details['lang']): if libname:
env.Replace(**backup) details['lib'] = libname
env['SKIPPED_DEPS'].append(details['lib'])
elif details['lib'] and details['inc']: elif details['path'] and details['lib'] and details['inc']:
if not conf.CheckLibWithHeader(details['lib'], details['inc'], details['lang']): backup = env.Clone().Dictionary()
env['SKIPPED_DEPS'].append(details['lib']) # Note, the 'delete_existing' keyword makes sure that these paths are prepended
# to the beginning of the path list even if they already exist
# re-append the local paths for mapnik sources to the beginning of the list incpath = env['%s_INCLUDES' % details['path']]
# to make sure they come before any plugins that were 'prepended' env.PrependUnique(CPPPATH = incpath,delete_existing=True)
env.PrependUnique(CPPPATH = '#include', delete_existing=True) env.PrependUnique(LIBPATH = env['%s_LIBS' % details['path']],delete_existing=True)
env.PrependUnique(CPPPATH = '#', delete_existing=True) if not conf.CheckLibWithHeader(details['lib'], details['inc'], details['lang']):
env.PrependUnique(LIBPATH = '#src', delete_existing=True) env.Replace(**backup)
env['SKIPPED_DEPS'].append(details['lib'])
elif details['lib'] and details['inc']:
if not conf.CheckLibWithHeader(details['lib'], details['inc'], details['lang']):
env['SKIPPED_DEPS'].append(details['lib'])
# re-append the local paths for mapnik sources to the beginning of the list
# to make sure they come before any plugins that were 'prepended'
env.PrependUnique(CPPPATH = '#include', delete_existing=True)
env.PrependUnique(CPPPATH = '#', delete_existing=True)
env.PrependUnique(LIBPATH = '#src', delete_existing=True)
# Decide which libagg to use # Decide which libagg to use
# if we are using internal agg, then prepend to make sure # if we are using internal agg, then prepend to make sure