From c9a4d3d8efa9e5a09aae04c86a85accdead9ae6a Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Mon, 12 Oct 2015 10:41:11 -0700 Subject: [PATCH] remove MAPNIK_VERSION_IS_RELEASE logic from scons - refs #3123 --- SConstruct | 6 ------ 1 file changed, 6 deletions(-) diff --git a/SConstruct b/SConstruct index 7e657674a..378ac185e 100644 --- a/SConstruct +++ b/SConstruct @@ -1069,7 +1069,6 @@ conf_tests = { 'prioritize_paths' : prioritize_paths, def GetMapnikLibVersion(): ver = [] - is_pre = False for line in open('include/mapnik/version.hpp').readlines(): if line.startswith('#define MAPNIK_MAJOR_VERSION'): ver.append(line.split(' ')[2].strip()) @@ -1077,12 +1076,7 @@ def GetMapnikLibVersion(): ver.append(line.split(' ')[2].strip()) if line.startswith('#define MAPNIK_PATCH_VERSION'): 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) - if is_pre: - version_string += '-pre' return version_string if not preconfigured: