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

scons: make sure to return 0 to keep linux happy

Browse source
This commit is contained in:
Dane Springmeyer 2009-02-17 22:41:35 +00:00
parent 5358417474
commit 75687151e8
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
SConstruct
View file

@ -304,6 +304,7 @@ def GetBoostLibVersion(context):
int main() int main()
{ {
std::cout << BOOST_LIB_VERSION << std::endl; std::cout << BOOST_LIB_VERSION << std::endl;
return 0;
} }
""", '.cpp') """, '.cpp')
# hack to avoid printed output # hack to avoid printed output
@ -319,16 +320,19 @@ def GetMapnikLibVersion(context):
int main() int main()
{ {
std::cout << MAPNIK_VERSION << std::endl; std::cout << MAPNIK_VERSION << std::endl;
return 0;
} }
""", '.cpp') """, '.cpp')
# hack to avoid printed output # hack to avoid printed output
context.did_show_result=1 context.did_show_result=1
context.Result(ret[0]) context.Result(ret[0])
if not ret[1]:
return []
version = int(ret[1].strip()) version = int(ret[1].strip())
patch_level = version % 100 patch_level = version % 100
minor_version = version / 100 % 1000 minor_version = version / 100 % 1000
major_version = version / 100000 major_version = version / 100000
return [major_version, minor_version,patch_level] return [major_version,minor_version,patch_level]
conf = Configure(env, custom_tests = { 'CheckPKGConfig' : CheckPKGConfig, conf = Configure(env, custom_tests = { 'CheckPKGConfig' : CheckPKGConfig,
'CheckPKG' : CheckPKG, 'CheckPKG' : CheckPKG,
@ -339,7 +343,13 @@ conf = Configure(env, custom_tests = { 'CheckPKGConfig' : CheckPKGConfig,
# fetch the mapnik version header in order to set the # fetch the mapnik version header in order to set the
# ABI version used to build libmapnik.so on linux in src/SConscript # ABI version used to build libmapnik.so on linux in src/SConscript
env['ABI_VERSION'] = conf.GetMapnikLibVersion() abi = conf.GetMapnikLibVersion()
abi_fallback = [0,6,0]
if not abi:
color_print(1,'Problem encountered parsing mapnik version (please post bug report to trac.mapnik.org), falling back to %s')
env['ABI_VERSION'] = abi_fallback
else:
env['ABI_VERSION'] = abi
#### Libraries and headers dependency checks #### #### Libraries and headers dependency checks ####
@ -438,6 +448,7 @@ for plugin in requested_plugins:
# get boost version from boost headers rather than previous approach # get boost version from boost headers rather than previous approach
# of fetching from the user provided INCLUDE path # of fetching from the user provided INCLUDE path
boost_system_required = False
boost_lib_version_from_header = conf.GetBoostLibVersion() boost_lib_version_from_header = conf.GetBoostLibVersion()
if boost_lib_version_from_header: if boost_lib_version_from_header:
boost_version_from_header = int(boost_lib_version_from_header.split('_')[1]) boost_version_from_header = int(boost_lib_version_from_header.split('_')[1])