diff options
| author | anatoly techtonik <techtonik@gmail.com> | 2014-09-26 16:17:38 +0300 |
|---|---|---|
| committer | anatoly techtonik <techtonik@gmail.com> | 2014-09-26 16:17:38 +0300 |
| commit | f50e624048d2251af4c1b23e0abe8b06ec6df7ca (patch) | |
| tree | 5ee3783961ca3d24c7910777e8082e4d080c13ce | |
| parent | 8cfb5d1b3c9ec0497d018f435c7238b22cbb644d (diff) | |
| download | scons-f50e624048d2251af4c1b23e0abe8b06ec6df7ca.tar.gz | |
Split __VERSION__ string in EnsureSConsVersion to avoid replacement
during package build process. This fixes SCons warning that it runs
in development mode.
| -rw-r--r-- | src/CHANGES.txt | 5 | ||||
| -rw-r--r-- | src/engine/SCons/Script/SConscript.py | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 58071ab2..4fc89b61 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 111d091a..f4a7f07d 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 |