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

7
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,6 +996,7 @@ 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'])]
if len(env['REQUESTED_PLUGINS']):
color_print(4,'Checking for requested plugins dependencies...') color_print(4,'Checking for requested plugins dependencies...')
for plugin in env['REQUESTED_PLUGINS']: for plugin in env['REQUESTED_PLUGINS']:
details = env['PLUGINS'][plugin] details = env['PLUGINS'][plugin]