From: Bo Peng <bpeng@lyx.org>
Date: Fri, 5 Sep 2008 01:29:27 +0000 (+0000)
Subject: Scons: do not check minor version of 0.96. Require at least 0.97.
X-Git-Tag: 1.6.10~3548
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=1c64fe44e88a150e4b7e96a84d3d11efe0747b92;p=features.git

Scons: do not check minor version of 0.96. Require at least 0.97.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26305 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index b86f9b6b98..b51b4e5427 100644
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -38,17 +38,8 @@ from scons_manifest import *
 
 # scons asks for 1.5.2, lyx requires 2.3
 EnsurePythonVersion(2, 3)
-# Please use at least 0.96.92 (not 0.96.1)
-EnsureSConsVersion(0, 96)
-# also check for minor version number for scons 0.96
-from SCons import __version__
-# allow the use of snapshot version of scons
-__version__ = __version__.split('d')[0]
-version = map(int, __version__.split('.'))
-if version[0] == 0 and version[1] == 96 and version[2] < 92:
-    print "Scons >= 0.96.92 is required."
-    Exit(1)
-
+# Please use at least version 0.97
+EnsureSConsVersion(0, 97)
 
 #----------------------------------------------------------
 # Global definitions