From d10380d12482dd4b1dc199c59b2a975e755e8504 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Fri, 21 May 2010 01:59:07 +0200 Subject: [PATCH] SCons: dropping pre 1.0 compatibility note: current SCons development is targetting 2.0, current stable is 1.3, which is included in Squeeze even Debian/Lenny includes 1.0. --- SConstruct | 2 +- admin/scons/LumieraEnvironment.py | 30 ++++++++---------------------- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/SConstruct b/SConstruct index d1addccdf..7956fac44 100644 --- a/SConstruct +++ b/SConstruct @@ -59,7 +59,7 @@ def setupBasicEnvironment(): """ define cmdline options, build type decisions """ EnsurePythonVersion(2,3) - EnsureSConsVersion(0,96,90) + EnsureSConsVersion(1,0) Decider('MD5-timestamp') # detect changed files by timestamp, then do a MD5 diff --git a/admin/scons/LumieraEnvironment.py b/admin/scons/LumieraEnvironment.py index 21b2a6c09..8b6a4b594 100644 --- a/admin/scons/LumieraEnvironment.py +++ b/admin/scons/LumieraEnvironment.py @@ -79,28 +79,14 @@ class LumieraEnvironment(Environment): if alias: self.libInfo[alias] = libInfo return libInfo - - def Glob (self, pattern): - """ temporary workaround; newer versions of SCons provide this as a global function """ - pattern = self.subst(pattern) - return glob.glob(pattern) - - def AddMethod (self, function): - """ temporary workaround; newer versions of SCons provide this as a global function """ - self.__dict__[function.__name__] = function.__get__(self) - - -#### temporary pre 1.0 SCons compatibility hack #### -_ver = map(int, SCons.__version__.split('.')[:2]) -_old = (_ver[0]<1 and _ver[1]<97) -if _old: - ConfigBase = SCons.SConf.SConf -else: - ConfigBase = SCons.SConf.SConfBase - del LumieraEnvironment.Glob - del LumieraEnvironment.AddMethod - # use the official impl present since SCons 0.98 - # use the new name of the config context base class + + + + + +# extending the 'Configure' functionality of SCons, +# especially for library dependency checking +ConfigBase = SCons.SConf.SConfBase