Merge tag 'upstream/2.4.0'

Upstream version 2.4.0

4 files changed, 12 insertions, 12 deletions

diff --git a/script/scons b/script/scons
index a56dd8d..0e59647 100644
--- a/script/scons
+++ b/script/scons
@@ -23,15 +23,15 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-__revision__ = "src/script/scons.py rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog"
+__revision__ = "src/script/scons.py rel_2.4.0:3365:9259ea1c13d7 2015/09/21 14:03:43 bdbaddog"
 
-__version__ = "2.3.6"
+__version__ = "2.4.0"
 
-__build__ = "rel_2.3.5:3347:d31d5a4e74b6[MODIFIED]"
+__build__ = "rel_2.4.0:3365:9259ea1c13d7"
 
 __buildsys__ = "hpmicrodog"
 
-__date__ = "2015/07/31 14:36:10"
+__date__ = "2015/09/21 14:03:43"
 
 __developer__ = "bdbaddog"
 
diff --git a/script/scons-time b/script/scons-time
index 1fe3de5..f37d906 100644
--- a/script/scons-time
+++ b/script/scons-time
@@ -32,7 +32,7 @@
 from __future__ import division
 from __future__ import nested_scopes
 
-__revision__ = "src/script/scons-time.py rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog"
+__revision__ = "src/script/scons-time.py rel_2.4.0:3365:9259ea1c13d7 2015/09/21 14:03:43 bdbaddog"
 
 import getopt
 import glob
diff --git a/script/scons.bat b/script/scons.bat
index add424e..bda2baa 100644
--- a/script/scons.bat
+++ b/script/scons.bat
@@ -1,11 +1,11 @@
 @REM Copyright (c) 2001 - 2015 The SCons Foundation

-@REM src/script/scons.bat rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog

+@REM src/script/scons.bat rel_2.4.0:3365:9259ea1c13d7 2015/09/21 14:03:43 bdbaddog

 @echo off

 set SCONS_ERRORLEVEL=

 if "%OS%" == "Windows_NT" goto WinNT

 

 @REM for 9x/Me you better not have more than 9 args

-python -c "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-2.3.6'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-2.3.6'), join(sys.prefix, 'scons')] + sys.path; import SCons.Script; SCons.Script.main()" %1 %2 %3 %4 %5 %6 %7 %8 %9

+python -c "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-2.4.0'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-2.4.0'), join(sys.prefix, 'scons')] + sys.path; import SCons.Script; SCons.Script.main()" %1 %2 %3 %4 %5 %6 %7 %8 %9

 @REM no way to set exit status of this script for 9x/Me

 goto endscons

 

diff --git a/script/sconsign b/script/sconsign
index c652bf7..35dad8a 100644
--- a/script/sconsign
+++ b/script/sconsign
@@ -23,15 +23,15 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-__revision__ = "src/script/sconsign.py rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog"
+__revision__ = "src/script/sconsign.py rel_2.4.0:3365:9259ea1c13d7 2015/09/21 14:03:43 bdbaddog"
 
-__version__ = "2.3.6"
+__version__ = "2.4.0"
 
-__build__ = "rel_2.3.5:3347:d31d5a4e74b6[MODIFIED]"
+__build__ = "rel_2.4.0:3365:9259ea1c13d7"
 
 __buildsys__ = "hpmicrodog"
 
-__date__ = "2015/07/31 14:36:10"
+__date__ = "2015/09/21 14:03:43"
 
 __developer__ = "bdbaddog"
 
@@ -278,7 +278,7 @@ def field(name, entry, verbose=Verbose):
 def nodeinfo_raw(name, ninfo, prefix=""):
     # This just formats the dictionary, which we would normally use str()
     # to do, except that we want the keys sorted for deterministic output.
-    d = ninfo.__dict__
+    d = ninfo.__getstate__()
     try:
         keys = ninfo.field_list + ['_version_id']
     except AttributeError: