Merge branch 'master' into remove_aegis_bits_issue_2639

4 files changed, 36 insertions, 35 deletions

diff --git a/bin/SConsExamples.py b/bin/SConsExamples.py
index 7491c58..501169e 100644
--- a/bin/SConsExamples.py
+++ b/bin/SConsExamples.py
@@ -882,7 +882,7 @@ def create_scons_output(e):
             lines = ExecuteCommand(args, command, t, {'osname':o.os, 'tools':o.tools})
             if not command.output and lines:
                 ncontent = '\n'.join(lines)
-                ncontent = address_re.sub(r' at 0x700000>', ncontent)
+                ncontent = address_re.sub(r' at 0x700000>', ncontent)
                 ncontent = engine_re.sub(r' File "bootstrap/src/engine/SCons/', ncontent)
                 ncontent = file_re.sub(r'\1 <module>', ncontent)
                 ncontent = nodelist_re.sub(r"\1 'NodeList' object \2", ncontent)
diff --git a/doc/generated/examples/troubleshoot_Dump_1.xml b/doc/generated/examples/troubleshoot_Dump_1.xml
index 99518c0..1f6f250 100644
--- a/doc/generated/examples/troubleshoot_Dump_1.xml
+++ b/doc/generated/examples/troubleshoot_Dump_1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons</userinput>
 scons: Reading SConscript files ...
-{ 'BUILDERS': {'_InternalInstall': &lt;function InstallBuilderWrapper at 0x700000&amp;gt;, '_InternalInstallVersionedLib': &lt;function InstallVersionedBuilderWrapper at 0x700000&amp;gt;, '_InternalInstallAs': &lt;function InstallAsBuilderWrapper at 0x700000&amp;gt;},
+{ 'BUILDERS': {'_InternalInstall': &lt;function InstallBuilderWrapper at 0x700000&gt;, '_InternalInstallVersionedLib': &lt;function InstallVersionedBuilderWrapper at 0x700000&gt;, '_InternalInstallAs': &lt;function InstallAsBuilderWrapper at 0x700000&gt;},
   'CONFIGUREDIR': '#/.sconf_temp',
   'CONFIGURELOG': '#/config.log',
   'CPPSUFFIXES': [ '.c',
@@ -25,16 +25,16 @@ scons: Reading SConscript files ...
                    '.SPP',
                    '.sx'],
   'DSUFFIXES': ['.d'],
-  'Dir': &lt;SCons.Defaults.Variable_Method_Caller object at 0x700000&amp;gt;,
-  'Dirs': &lt;SCons.Defaults.Variable_Method_Caller object at 0x700000&amp;gt;,
+  'Dir': &lt;SCons.Defaults.Variable_Method_Caller object at 0x700000&gt;,
+  'Dirs': &lt;SCons.Defaults.Variable_Method_Caller object at 0x700000&gt;,
   'ENV': { 'PATH': '/usr/local/bin:/opt/bin:/bin:/usr/bin'},
-  'ESCAPE': &lt;function escape at 0x700000&amp;gt;,
-  'File': &lt;SCons.Defaults.Variable_Method_Caller object at 0x700000&amp;gt;,
+  'ESCAPE': &lt;function escape at 0x700000&gt;,
+  'File': &lt;SCons.Defaults.Variable_Method_Caller object at 0x700000&gt;,
   'HOST_ARCH': None,
   'HOST_OS': None,
   'IDLSUFFIXES': ['.idl', '.IDL'],
-  'INSTALL': &lt;function copyFunc at 0x700000&amp;gt;,
-  'INSTALLVERSIONEDLIB': &lt;function copyFuncVersionedLib at 0x700000&amp;gt;,
+  'INSTALL': &lt;function copyFunc at 0x700000&gt;,
+  'INSTALLVERSIONEDLIB': &lt;function copyFuncVersionedLib at 0x700000&gt;,
   'LIBPREFIX': 'lib',
   'LIBPREFIXES': ['$LIBPREFIX'],
   'LIBSUFFIX': '.a',
@@ -45,15 +45,15 @@ scons: Reading SConscript files ...
   'PLATFORM': 'posix',
   'PROGPREFIX': '',
   'PROGSUFFIX': '',
-  'PSPAWN': &lt;function piped_env_spawn at 0x700000&amp;gt;,
-  'RDirs': &lt;SCons.Defaults.Variable_Method_Caller object at 0x700000&amp;gt;,
-  'SCANNERS': [&lt;SCons.Scanner.Base object at 0x700000&amp;gt;],
+  'PSPAWN': &lt;function piped_env_spawn at 0x700000&gt;,
+  'RDirs': &lt;SCons.Defaults.Variable_Method_Caller object at 0x700000&gt;,
+  'SCANNERS': [&lt;SCons.Scanner.Base object at 0x700000&gt;],
   'SHELL': 'sh',
   'SHLIBPREFIX': '$LIBPREFIX',
   'SHLIBSUFFIX': '.so',
   'SHOBJPREFIX': '$OBJPREFIX',
   'SHOBJSUFFIX': '$OBJSUFFIX',
-  'SPAWN': &lt;function subprocess_spawn at 0x700000&amp;gt;,
+  'SPAWN': &lt;function subprocess_spawn at 0x700000&gt;,
   'TARGET_ARCH': None,
   'TARGET_OS': None,
   'TEMPFILE': &lt;class 'SCons.Platform.TempFileMunge'&gt;,
@@ -69,10 +69,10 @@ scons: Reading SConscript files ...
   '__LDMODULEVERSIONFLAGS': '${__libversionflags(__env__,"LDMODULEVERSION","_LDMODULEVERSIONFLAGS")}',
   '__RPATH': '$_RPATH',
   '__SHLIBVERSIONFLAGS': '${__libversionflags(__env__,"SHLIBVERSION","_SHLIBVERSIONFLAGS")}',
-  '__libversionflags': &lt;function __libversionflags at 0x700000&amp;gt;,
-  '_concat': &lt;function _concat at 0x700000&amp;gt;,
-  '_defines': &lt;function _defines at 0x700000&amp;gt;,
-  '_stripixes': &lt;function _stripixes at 0x700000&amp;gt;}
+  '__libversionflags': &lt;function __libversionflags at 0x700000&gt;,
+  '_concat': &lt;function _concat at 0x700000&gt;,
+  '_defines': &lt;function _defines at 0x700000&gt;,
+  '_stripixes': &lt;function _stripixes at 0x700000&gt;}
 scons: done reading SConscript files.
 scons: Building targets ...
 scons: `.' is up to date.
diff --git a/doc/generated/examples/troubleshoot_Dump_2.xml b/doc/generated/examples/troubleshoot_Dump_2.xml
index d83fb94..6722575 100644
--- a/doc/generated/examples/troubleshoot_Dump_2.xml
+++ b/doc/generated/examples/troubleshoot_Dump_2.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">C:\&gt;<userinput>scons</userinput>
 scons: Reading SConscript files ...
-{ 'BUILDERS': {'_InternalInstallVersionedLib': &lt;function InstallVersionedBuilderWrapper at 0x700000&amp;gt;, '_InternalInstall': &lt;function InstallBuilderWrapper at 0x700000&amp;gt;, 'Object': &lt;SCons.Builder.CompositeBuilder object at 0x700000&amp;gt;, 'PCH': &lt;SCons.Builder.BuilderBase object at 0x700000&amp;gt;, 'RES': &lt;SCons.Builder.BuilderBase object at 0x700000&amp;gt;, 'SharedObject': &lt;SCons.Builder.CompositeBuilder object at 0x700000&amp;gt;, 'StaticObject': &lt;SCons.Builder.CompositeBuilder object at 0x700000&amp;gt;, '_InternalInstallAs': &lt;function InstallAsBuilderWrapper at 0x700000&amp;gt;},
+{ 'BUILDERS': {'_InternalInstallVersionedLib': &lt;function InstallVersionedBuilderWrapper at 0x700000&gt;, '_InternalInstall': &lt;function InstallBuilderWrapper at 0x700000&gt;, 'Object': &lt;SCons.Builder.CompositeBuilder object at 0x700000&gt;, 'PCH': &lt;SCons.Builder.BuilderBase object at 0x700000&gt;, 'RES': &lt;SCons.Builder.BuilderBase object at 0x700000&gt;, 'SharedObject': &lt;SCons.Builder.CompositeBuilder object at 0x700000&gt;, 'StaticObject': &lt;SCons.Builder.CompositeBuilder object at 0x700000&gt;, '_InternalInstallAs': &lt;function InstallAsBuilderWrapper at 0x700000&gt;},
   'CC': 'cl',
-  'CCCOM': &lt;SCons.Action.FunctionAction object at 0x700000&amp;gt;,
+  'CCCOM': &lt;SCons.Action.FunctionAction object at 0x700000&gt;,
   'CCFLAGS': ['/nologo'],
   'CCPCHFLAGS': ['${(PCH and "/Yu%s \\"/Fp%s\\""%(PCHSTOP or "",File(PCH))) or ""}'],
   'CCPDBFLAGS': ['${(PDB and "/Z7") or ""}'],
@@ -38,20 +38,20 @@ scons: Reading SConscript files ...
   'CXXFILESUFFIX': '.cc',
   'CXXFLAGS': ['$(', '/TP', '$)'],
   'DSUFFIXES': ['.d'],
-  'Dir': &lt;SCons.Defaults.Variable_Method_Caller object at 0x700000&amp;gt;,
-  'Dirs': &lt;SCons.Defaults.Variable_Method_Caller object at 0x700000&amp;gt;,
+  'Dir': &lt;SCons.Defaults.Variable_Method_Caller object at 0x700000&gt;,
+  'Dirs': &lt;SCons.Defaults.Variable_Method_Caller object at 0x700000&gt;,
   'ENV': { 'PATH': 'C:\\WINDOWS\\System32',
            'PATHEXT': '.COM;.EXE;.BAT;.CMD',
            'SystemRoot': 'C:\\WINDOWS'},
-  'ESCAPE': &lt;function escape at 0x700000&amp;gt;,
-  'File': &lt;SCons.Defaults.Variable_Method_Caller object at 0x700000&amp;gt;,
+  'ESCAPE': &lt;function escape at 0x700000&gt;,
+  'File': &lt;SCons.Defaults.Variable_Method_Caller object at 0x700000&gt;,
   'HOST_ARCH': '',
   'HOST_OS': 'win32',
   'IDLSUFFIXES': ['.idl', '.IDL'],
   'INCPREFIX': '/I',
   'INCSUFFIX': '',
-  'INSTALL': &lt;function copyFunc at 0x700000&amp;gt;,
-  'INSTALLVERSIONEDLIB': &lt;function copyFuncVersionedLib at 0x700000&amp;gt;,
+  'INSTALL': &lt;function copyFunc at 0x700000&gt;,
+  'INSTALLVERSIONEDLIB': &lt;function copyFuncVersionedLib at 0x700000&gt;,
   'LEXUNISTD': ['--nounistd'],
   'LIBPREFIX': '',
   'LIBPREFIXES': ['$LIBPREFIX'],
@@ -66,15 +66,15 @@ scons: Reading SConscript files ...
   'PLATFORM': 'win32',
   'PROGPREFIX': '',
   'PROGSUFFIX': '.exe',
-  'PSPAWN': &lt;function piped_spawn at 0x700000&amp;gt;,
+  'PSPAWN': &lt;function piped_spawn at 0x700000&gt;,
   'RC': 'rc',
-  'RCCOM': &lt;SCons.Action.FunctionAction object at 0x700000&amp;gt;,
+  'RCCOM': &lt;SCons.Action.FunctionAction object at 0x700000&gt;,
   'RCFLAGS': ['/nologo'],
   'RCSUFFIXES': ['.rc', '.rc2'],
-  'RDirs': &lt;SCons.Defaults.Variable_Method_Caller object at 0x700000&amp;gt;,
-  'SCANNERS': [&lt;SCons.Scanner.Base object at 0x700000&amp;gt;],
+  'RDirs': &lt;SCons.Defaults.Variable_Method_Caller object at 0x700000&gt;,
+  'SCANNERS': [&lt;SCons.Scanner.Base object at 0x700000&gt;],
   'SHCC': '$CC',
-  'SHCCCOM': &lt;SCons.Action.FunctionAction object at 0x700000&amp;gt;,
+  'SHCCCOM': &lt;SCons.Action.FunctionAction object at 0x700000&gt;,
   'SHCCFLAGS': ['$CCFLAGS'],
   'SHCFLAGS': ['$CFLAGS'],
   'SHCXX': '$CXX',
@@ -85,7 +85,7 @@ scons: Reading SConscript files ...
   'SHLIBSUFFIX': '.dll',
   'SHOBJPREFIX': '$OBJPREFIX',
   'SHOBJSUFFIX': '$OBJSUFFIX',
-  'SPAWN': &lt;function spawn at 0x700000&amp;gt;,
+  'SPAWN': &lt;function spawn at 0x700000&gt;,
   'STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME': 1,
   'TARGET_ARCH': None,
   'TARGET_OS': None,
@@ -98,14 +98,14 @@ scons: Reading SConscript files ...
   '_CPPINCFLAGS': '$( ${_concat(INCPREFIX, CPPPATH, INCSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)',
   '_LIBDIRFLAGS': '$( ${_concat(LIBDIRPREFIX, LIBPATH, LIBDIRSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)',
   '_LIBFLAGS': '${_concat(LIBLINKPREFIX, LIBS, LIBLINKSUFFIX, __env__)}',
-  '_MSVC_OUTPUT_FLAG': &lt;function msvc_output_flag at 0x700000&amp;gt;,
+  '_MSVC_OUTPUT_FLAG': &lt;function msvc_output_flag at 0x700000&gt;,
   '__DSHLIBVERSIONFLAGS': '${__libversionflags(__env__,"DSHLIBVERSION","_DSHLIBVERSIONFLAGS")}',
   '__LDMODULEVERSIONFLAGS': '${__libversionflags(__env__,"LDMODULEVERSION","_LDMODULEVERSIONFLAGS")}',
   '__SHLIBVERSIONFLAGS': '${__libversionflags(__env__,"SHLIBVERSION","_SHLIBVERSIONFLAGS")}',
-  '__libversionflags': &lt;function __libversionflags at 0x700000&amp;gt;,
-  '_concat': &lt;function _concat at 0x700000&amp;gt;,
-  '_defines': &lt;function _defines at 0x700000&amp;gt;,
-  '_stripixes': &lt;function _stripixes at 0x700000&amp;gt;}
+  '__libversionflags': &lt;function __libversionflags at 0x700000&gt;,
+  '_concat': &lt;function _concat at 0x700000&gt;,
+  '_defines': &lt;function _defines at 0x700000&gt;,
+  '_stripixes': &lt;function _stripixes at 0x700000&gt;}
 scons: done reading SConscript files.
 scons: Building targets ...
 scons: `.' is up to date.
diff --git a/doc/generated/examples/troubleshoot_explain1_3.xml b/doc/generated/examples/troubleshoot_explain1_3.xml
index 2bb986c..cb3ef9b 100644
--- a/doc/generated/examples/troubleshoot_explain1_3.xml
+++ b/doc/generated/examples/troubleshoot_explain1_3.xml
@@ -4,4 +4,5 @@ cp file.in file.oout
 
 scons: warning: Cannot find target file.out after building
 File "/Users/bdbaddog/devel/scons/git/scons-bugfixes-3/src/script/scons.py", line 204, in &lt;module&gt;
+File "/home/mats/github/scons/src/script/scons.py", line 204, in &lt;module&gt;
 </screen>