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

remove MAPNIK_VERSION_IS_RELEASE logic from scons - refs #3123

Browse source
This commit is contained in:
Dane Springmeyer 2015-10-12 10:41:11 -07:00
parent 67718ed8e1
commit c9a4d3d8ef
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
SConstruct
View file

@ -1069,7 +1069,6 @@ conf_tests = { 'prioritize_paths' : prioritize_paths,
def GetMapnikLibVersion(): def GetMapnikLibVersion():
ver = [] ver = []
is_pre = False
for line in open('include/mapnik/version.hpp').readlines(): for line in open('include/mapnik/version.hpp').readlines():
if line.startswith('#define MAPNIK_MAJOR_VERSION'): if line.startswith('#define MAPNIK_MAJOR_VERSION'):
ver.append(line.split(' ')[2].strip()) ver.append(line.split(' ')[2].strip())
@ -1077,12 +1076,7 @@ def GetMapnikLibVersion():
ver.append(line.split(' ')[2].strip()) ver.append(line.split(' ')[2].strip())
if line.startswith('#define MAPNIK_PATCH_VERSION'): if line.startswith('#define MAPNIK_PATCH_VERSION'):
ver.append(line.split(' ')[2].strip()) ver.append(line.split(' ')[2].strip())
if line.startswith('#define MAPNIK_VERSION_IS_RELEASE'):
if line.split(' ')[2].strip() == "0":
is_pre = True
version_string = ".".join(ver) version_string = ".".join(ver)
if is_pre:
version_string += '-pre'
return version_string return version_string
if not preconfigured: if not preconfigured: