Merged in garyo/scons-garyo (pull request #173)

SWIG: improve tool detection, and update SWIG tests to run on Windows.

3 files changed, 10 insertions, 0 deletions

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 05e326ec..cf4264a8 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -6,6 +6,9 @@
 
 RELEASE 2.3.2.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
 
+  From Anatoly Techtonik:
+    - Do not fail on EnsureSConsVersion when running from checkout
+
   From Kendrick Boyd and Rob Managan:
     - Fixed the newglossary action to work with VariantDir (LaTeX).
 
diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py
index bd515d25..111d091a 100644
--- a/src/engine/SCons/Script/SConscript.py
+++ b/src/engine/SCons/Script/SConscript.py
@@ -461,6 +461,10 @@ 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__':
+            SCons.Warnings.warn(SCons.Warnings.DevelopmentVersionWarning,
+                "EnsureSConsVersion is ignored for development version")
+            return
         scons_ver = self._get_major_minor_revision(SCons.__version__)
         if scons_ver < (major, minor, revision):
             if revision:
diff --git a/src/engine/SCons/Warnings.py b/src/engine/SCons/Warnings.py
index ca6acee9..5c278252 100644
--- a/src/engine/SCons/Warnings.py
+++ b/src/engine/SCons/Warnings.py
@@ -54,6 +54,9 @@ class CorruptSConsignWarning(WarningOnByDefault):
 class DependencyWarning(Warning):
     pass
 
+class DevelopmentVersionWarning(WarningOnByDefault):
+    pass
+
 class DuplicateEnvironmentWarning(WarningOnByDefault):
     pass