diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-09-28 18:52:22 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-09-28 18:52:22 +0200 |
| commit | ac13c85de2a2119df399cc8471a58848ba318a98 (patch) | |
| tree | 365734dbe3b905ef76db08d37fcab46d13a83689 /QMTest/TestSCons.py | |
| parent | a6c2edbcf7a367557d645198e85d4461c71892ee (diff) | |
| parent | f681a1fb71c146c754f57508afac240d0e1b47e1 (diff) | |
Merge tag 'upstream/2.4.0'
Upstream version 2.4.0
Diffstat (limited to 'QMTest/TestSCons.py')
| -rw-r--r-- | QMTest/TestSCons.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index fb6e7b0..ff3c0a9 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -15,7 +15,7 @@ attributes defined in this subclass. # Copyright (c) 2001 - 2015 The SCons Foundation from __future__ import division -__revision__ = "QMTest/TestSCons.py rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog" +__revision__ = "QMTest/TestSCons.py rel_2.4.0:3365:9259ea1c13d7 2015/09/21 14:03:43 bdbaddog" import os import re @@ -34,7 +34,7 @@ from TestCmd import PIPE # here provides some independent verification that what we packaged # conforms to what we expect. -default_version = '2.3.6' +default_version = '2.4.0' python_version_unsupported = (2, 3, 0) python_version_deprecated = (2, 7, 0) @@ -43,7 +43,7 @@ python_version_deprecated = (2, 7, 0) # line must remain "__ VERSION __" (without the spaces) so the built # version in build/QMTest/TestSCons.py contains the actual version # string of the packages that have been built. -SConsVersion = '2.3.6' +SConsVersion = '2.4.0' if SConsVersion == '__' + 'VERSION' + '__': SConsVersion = default_version |