From 0b806ea5b203f1ef876f5d91294aaeabdc5a639a Mon Sep 17 00:00:00 2001 From: anatoly techtonik Date: Fri, 26 Sep 2014 16:17:38 +0300 Subject: Split __VERSION__ string in EnsureSConsVersion to avoid replacement during package build process. This fixes SCons warning that it runs in development mode. --- src/CHANGES.txt | 5 +++++ src/engine/SCons/Script/SConscript.py | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 58071ab..4fc89b6 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -11,6 +11,11 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER Configure contexts (#2971). +RELEASE 2.3.4 - Sss, DD Mmm yyyy hh:mm:ss -zzzz + + From Anatoly Techtonik: + - Fix EnsureSConsVersion warning when running packaged version + RELEASE 2.3.3 - Sun, 24 Aug 2014 21:08:33 -0400 From Roland Stark: diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py index 111d091..f4a7f07 100644 --- a/src/engine/SCons/Script/SConscript.py +++ b/src/engine/SCons/Script/SConscript.py @@ -461,7 +461,8 @@ class SConsEnvironment(SCons.Environment.Base): def EnsureSConsVersion(self, major, minor, revision=0): """Exit abnormally if the SCons version is not late enough.""" - if SCons.__version__ == '__VERSION__': + # split string to avoid replacement during build process + if SCons.__version__ == '__' + 'VERSION__': SCons.Warnings.warn(SCons.Warnings.DevelopmentVersionWarning, "EnsureSConsVersion is ignored for development version") return -- cgit v0.12