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

ICU DATA: Default to icu-config if u_getDataDirectory fails

Browse source
This commit is contained in:
Raul Marin 2018-02-23 15:25:13 +01:00 committed by Artem Pavlenko
parent 98d39ff398
commit 2cef98d7f7
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
SConstruct
View file

@ -830,9 +830,16 @@ int main() {
context.did_show_result=1 context.did_show_result=1
if ret[0]: if ret[0]:
context.Result('u_getDataDirectory returned %s' % ret[1]) context.Result('u_getDataDirectory returned %s' % ret[1])
return ret[1].strip()
else:
ret = call("icu-config --icudatadir", silent=True)
if ret:
context.Result('icu-config returned %s' % ret)
return ret
else: else:
context.Result('Failed to detect (mapnik-config will have null value)') context.Result('Failed to detect (mapnik-config will have null value)')
return ret[1].strip() return ''
def CheckGdalData(context, silent=False): def CheckGdalData(context, silent=False):