Merge tag 'upstream/2.3.5'

Upstream version 2.3.5

8 files changed, 20 insertions, 18 deletions

diff --git a/QMTest/README.txt b/QMTest/README.txt
index 28c37de..10f5148 100644
--- a/QMTest/README.txt
+++ b/QMTest/README.txt
@@ -54,5 +54,5 @@ the pieces here are local to SCons.
         from this infrastructure, in no small part because we're not
         really using it as originally envisioned.
 
-Copyright (c) 2001 - 2014 The SCons Foundation
-QMTest/README.txt  2014/09/27 12:51:43 garyo
+Copyright (c) 2001 - 2015 The SCons Foundation
+QMTest/README.txt pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog
diff --git a/QMTest/SConscript b/QMTest/SConscript
index eb1ece5..7cf784c 100644
--- a/QMTest/SConscript
+++ b/QMTest/SConscript
@@ -3,7 +3,7 @@
 #
 
 #
-# Copyright (c) 2001 - 2014 The SCons Foundation
+# Copyright (c) 2001 - 2015 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
diff --git a/QMTest/TestRuntest.py b/QMTest/TestRuntest.py
index aebf76a..240cf49 100644
--- a/QMTest/TestRuntest.py
+++ b/QMTest/TestRuntest.py
@@ -12,9 +12,9 @@ from those classes, as well as any overridden or additional methods or
 attributes defined in this subclass.
 """
 
-# Copyright (c) 2001 - 2014 The SCons Foundation
+# Copyright (c) 2001 - 2015 The SCons Foundation
 
-__revision__ = "QMTest/TestRuntest.py  2014/09/27 12:51:43 garyo"
+__revision__ = "QMTest/TestRuntest.py pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog"
 
 import os
 import os.path
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index 35ed918..a786ec7 100644
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -12,10 +12,10 @@ from those classes, as well as any overridden or additional methods or
 attributes defined in this subclass.
 """
 
-# Copyright (c) 2001 - 2014 The SCons Foundation
+# Copyright (c) 2001 - 2015 The SCons Foundation
 from __future__ import division
 
-__revision__ = "QMTest/TestSCons.py  2014/09/27 12:51:43 garyo"
+__revision__ = "QMTest/TestSCons.py pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 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.4'
+default_version = '2.3.5'
 
 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.4'
+SConsVersion = '2.3.5'
 if SConsVersion == '__' + 'VERSION' + '__':
     SConsVersion = default_version
 
@@ -693,7 +693,7 @@ class TestSCons(TestCommon):
         else:
             jni_dirs = ['/System/Library/Frameworks/JavaVM.framework/Versions/%s*/Headers/jni.h'%version]
         jni_dirs.extend(['/usr/lib/jvm/java-*-sun-%s*/include/jni.h'%version,
-                         '/usr/lib/jvm/java-%s*-openjdk/include/jni.h'%version,
+                         '/usr/lib/jvm/java-%s*-openjdk*/include/jni.h'%version,
                          '/usr/java/jdk%s*/include/jni.h'%version])
         dirs = self.paths(jni_dirs)
         if not dirs:
diff --git a/QMTest/TestSConsMSVS.py b/QMTest/TestSConsMSVS.py
index a8b6982..6a1ece4 100644
--- a/QMTest/TestSConsMSVS.py
+++ b/QMTest/TestSConsMSVS.py
@@ -13,9 +13,9 @@ as well as any overridden or additional methods or attributes defined
 in this subclass.
 """
 
-# Copyright (c) 2001 - 2014 The SCons Foundation
+# Copyright (c) 2001 - 2015 The SCons Foundation
 
-__revision__ = "QMTest/TestSConsMSVS.py  2014/09/27 12:51:43 garyo"
+__revision__ = "QMTest/TestSConsMSVS.py pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog"
 
 import os
 import sys
@@ -709,6 +709,7 @@ expected_vcprojfile_10_0 = """\
 \t<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 \t\t<ConfigurationType>Makefile</ConfigurationType>
 \t\t<UseOfMfc>false</UseOfMfc>
+\t\t<PlatformToolset>v100</PlatformToolset>
 \t</PropertyGroup>
 \t<Import Project="$(VCTargetsPath)\\Microsoft.Cpp.props" />
 \t<ImportGroup Label="ExtensionSettings">
@@ -773,6 +774,7 @@ expected_vcprojfile_11_0 = """\
 \t<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 \t\t<ConfigurationType>Makefile</ConfigurationType>
 \t\t<UseOfMfc>false</UseOfMfc>
+\t\t<PlatformToolset>v110</PlatformToolset>
 \t</PropertyGroup>
 \t<Import Project="$(VCTargetsPath)\\Microsoft.Cpp.props" />
 \t<ImportGroup Label="ExtensionSettings">
diff --git a/QMTest/TestSCons_time.py b/QMTest/TestSCons_time.py
index 5c36bec..9dad253 100644
--- a/QMTest/TestSCons_time.py
+++ b/QMTest/TestSCons_time.py
@@ -11,9 +11,9 @@ from those classes, as well as any overridden or additional methods or
 attributes defined in this subclass.
 """
 
-# Copyright (c) 2001 - 2014 The SCons Foundation
+# Copyright (c) 2001 - 2015 The SCons Foundation
 
-__revision__ = "QMTest/TestSCons_time.py  2014/09/27 12:51:43 garyo"
+__revision__ = "QMTest/TestSCons_time.py pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog"
 
 import os
 import os.path
diff --git a/QMTest/TestSConsign.py b/QMTest/TestSConsign.py
index 9285975..f3d88fd 100644
--- a/QMTest/TestSConsign.py
+++ b/QMTest/TestSConsign.py
@@ -1,6 +1,6 @@
-# Copyright (c) 2001 - 2014 The SCons Foundation
+# Copyright (c) 2001 - 2015 The SCons Foundation
 
-__revision__ = "QMTest/TestSConsign.py  2014/09/27 12:51:43 garyo"
+__revision__ = "QMTest/TestSConsign.py pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog"
 
 __doc__ = """
 TestSConsign.py:  a testing framework for the "sconsign" script 
diff --git a/QMTest/scons_tdb.py b/QMTest/scons_tdb.py
index 8994a62..b9eb4af 100644
--- a/QMTest/scons_tdb.py
+++ b/QMTest/scons_tdb.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2001 - 2014 The SCons Foundation
+# Copyright (c) 2001 - 2015 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -28,7 +28,7 @@ QMTest classes to support SCons' testing and Aegis-inspired workflow.
 Thanks to Stefan Seefeld for the initial code.
 """
 
-__revision__ = "QMTest/scons_tdb.py  2014/09/27 12:51:43 garyo"
+__revision__ = "QMTest/scons_tdb.py pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog"
 
 ########################################################################
 # Imports