summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--QMTest/TestSCons.py2
-rw-r--r--README.rst16
-rw-r--r--SConstruct2
-rw-r--r--doc/generated/examples/EnumVariable_map_1.xml2
-rw-r--r--doc/generated/examples/addmethod_ex1_1.xml2
-rw-r--r--doc/generated/examples/addmethod_ex2_1.xml2
-rw-r--r--doc/generated/examples/addmethod_ex2_2.xml2
-rw-r--r--doc/generated/examples/alias_ex1_1.xml2
-rw-r--r--doc/generated/examples/alias_ex2_1.xml8
-rw-r--r--doc/generated/examples/buildersbuiltin_ex1_1.xml2
-rw-r--r--doc/generated/examples/buildersbuiltin_ex2_1.xml2
-rw-r--r--doc/generated/examples/buildersbuiltin_ex3_1.xml2
-rw-r--r--doc/generated/examples/buildersbuiltin_ex4_1.xml2
-rw-r--r--doc/generated/examples/buildersbuiltin_libs_1.xml2
-rw-r--r--doc/generated/examples/buildersbuiltin_libs_2.xml2
-rw-r--r--doc/generated/examples/builderscommands_ex1_1.xml2
-rw-r--r--doc/generated/examples/builderscommands_ex2_1.xml2
-rw-r--r--doc/generated/examples/builderswriting_MY_EMITTER_1.xml2
-rw-r--r--doc/generated/examples/builderswriting_ex1_1.xml2
-rw-r--r--doc/generated/examples/builderswriting_ex2_1.xml1
-rw-r--r--doc/generated/examples/builderswriting_ex3_1.xml2
-rw-r--r--doc/generated/examples/builderswriting_ex4_1.xml2
-rw-r--r--doc/generated/examples/builderswriting_ex5_1.xml2
-rw-r--r--doc/generated/examples/builderswriting_ex6_1.xml2
-rw-r--r--doc/generated/examples/builderswriting_ex7_1.xml2
-rw-r--r--doc/generated/examples/caching_ex-random_1.xml4
-rw-r--r--doc/generated/examples/caching_ex1_1.xml6
-rw-r--r--doc/generated/examples/caching_ex1_2.xml6
-rw-r--r--doc/generated/examples/caching_ex1_4.xml10
-rw-r--r--doc/generated/examples/caching_ex1_5.xml10
-rw-r--r--doc/generated/examples/commandline_ARGLIST_1.xml4
-rw-r--r--doc/generated/examples/commandline_ARGUMENTS_1.xml8
-rw-r--r--doc/generated/examples/commandline_AddOption_1.xml2
-rw-r--r--doc/generated/examples/commandline_AddOption_2.xml2
-rw-r--r--doc/generated/examples/commandline_BUILD_TARGETS_1_1.xml6
-rw-r--r--doc/generated/examples/commandline_BoolVariable_1.xml2
-rw-r--r--doc/generated/examples/commandline_BoolVariable_2.xml2
-rw-r--r--doc/generated/examples/commandline_BoolVariable_3.xml2
-rw-r--r--doc/generated/examples/commandline_BoolVariable_4.xml2
-rw-r--r--doc/generated/examples/commandline_BoolVariable_5.xml1
-rw-r--r--doc/generated/examples/commandline_COMMAND_LINE_TARGETS_1.xml4
-rw-r--r--doc/generated/examples/commandline_DEFAULT_TARGETS_1_1.xml2
-rw-r--r--doc/generated/examples/commandline_DEFAULT_TARGETS_2_1.xml2
-rw-r--r--doc/generated/examples/commandline_Default1_1.xml6
-rw-r--r--doc/generated/examples/commandline_Default1_2.xml2
-rw-r--r--doc/generated/examples/commandline_Default2_1.xml4
-rw-r--r--doc/generated/examples/commandline_Default3_1.xml6
-rw-r--r--doc/generated/examples/commandline_Default4_1.xml4
-rw-r--r--doc/generated/examples/commandline_EnumVariable_1.xml6
-rw-r--r--doc/generated/examples/commandline_EnumVariable_2.xml1
-rw-r--r--doc/generated/examples/commandline_EnumVariable_3.xml3
-rw-r--r--doc/generated/examples/commandline_EnumVariable_ic1_1.xml8
-rw-r--r--doc/generated/examples/commandline_EnumVariable_ic2_1.xml6
-rw-r--r--doc/generated/examples/commandline_ListVariable_1.xml4
-rw-r--r--doc/generated/examples/commandline_ListVariable_2.xml4
-rw-r--r--doc/generated/examples/commandline_ListVariable_3.xml1
-rw-r--r--doc/generated/examples/commandline_PackageVariable_1.xml8
-rw-r--r--doc/generated/examples/commandline_PathVariable_1.xml4
-rw-r--r--doc/generated/examples/commandline_PathVariable_2.xml1
-rw-r--r--doc/generated/examples/commandline_SCONSFLAGS_1.xml4
-rw-r--r--doc/generated/examples/commandline_SetOption_1.xml2
-rw-r--r--doc/generated/examples/commandline_SetOption_2.xml2
-rw-r--r--doc/generated/examples/commandline_SetOption_3.xml4
-rw-r--r--doc/generated/examples/commandline_UnknownVariables_1.xml2
-rw-r--r--doc/generated/examples/commandline_Variables1_1.xml2
-rw-r--r--doc/generated/examples/commandline_Variables_Help_1.xml2
-rw-r--r--doc/generated/examples/commandline_Variables_custom_py_1_1.xml2
-rw-r--r--doc/generated/examples/commandline_Variables_custom_py_2_1.xml2
-rw-r--r--doc/generated/examples/depends_AlwaysBuild_1.xml4
-rw-r--r--doc/generated/examples/depends_AlwaysBuild_2.xml4
-rw-r--r--doc/generated/examples/depends_Requires_1.xml8
-rw-r--r--doc/generated/examples/depends_ex1_1.xml4
-rw-r--r--doc/generated/examples/depends_ex1_2.xml4
-rw-r--r--doc/generated/examples/depends_ex1_3.xml4
-rw-r--r--doc/generated/examples/depends_ex1_4.xml4
-rw-r--r--doc/generated/examples/depends_ex1_5.xml4
-rw-r--r--doc/generated/examples/depends_ex1_6.xml4
-rw-r--r--doc/generated/examples/depends_ex1_7.xml4
-rw-r--r--doc/generated/examples/depends_ex1_8.xml4
-rw-r--r--doc/generated/examples/depends_ex5_1.xml2
-rw-r--r--doc/generated/examples/depends_ex5_2.xml2
-rw-r--r--doc/generated/examples/depends_ignore_explicit_1.xml6
-rw-r--r--doc/generated/examples/depends_include_1.xml6
-rw-r--r--doc/generated/examples/depends_macroinc_1.xml4
-rw-r--r--doc/generated/examples/depends_match_1.xml4
-rw-r--r--doc/generated/examples/depends_mixing_1.xml4
-rw-r--r--doc/generated/examples/depends_newer_1.xml4
-rw-r--r--doc/generated/examples/depends_no-Requires_1.xml6
-rw-r--r--doc/generated/examples/depends_parsedep_1.xml4
-rw-r--r--doc/generated/examples/environments_Append-nonexistent_1.xml2
-rw-r--r--doc/generated/examples/environments_Prepend-nonexistent_1.xml2
-rw-r--r--doc/generated/examples/environments_Replace-nonexistent_1.xml2
-rw-r--r--doc/generated/examples/environments_Replace1_1.xml2
-rw-r--r--doc/generated/examples/environments_Replace2_1.xml2
-rw-r--r--doc/generated/examples/environments_ex1_1.xml2
-rw-r--r--doc/generated/examples/environments_ex2_1.xml2
-rw-r--r--doc/generated/examples/environments_ex3_1.xml3
-rw-r--r--doc/generated/examples/environments_ex4_1.xml2
-rw-r--r--doc/generated/examples/environments_ex5_1.xml2
-rw-r--r--doc/generated/examples/environments_ex6_1.xml2
-rw-r--r--doc/generated/examples/environments_ex6b_1.xml2
-rw-r--r--doc/generated/examples/environments_ex6b_2.xml2
-rw-r--r--doc/generated/examples/environments_ex8_1.xml2
-rw-r--r--doc/generated/examples/environments_ex9_1.xml2
-rw-r--r--doc/generated/examples/environments_missing1_1.xml2
-rw-r--r--doc/generated/examples/environments_missing2_1.xml1
-rw-r--r--doc/generated/examples/environments_missing3_1.xml2
-rw-r--r--doc/generated/examples/factories_Chmod_1.xml2
-rw-r--r--doc/generated/examples/factories_Copy1_1.xml2
-rw-r--r--doc/generated/examples/factories_Copy2_1.xml2
-rw-r--r--doc/generated/examples/factories_Copy3_1.xml2
-rw-r--r--doc/generated/examples/factories_Delete1_1.xml2
-rw-r--r--doc/generated/examples/factories_Delete2_1.xml2
-rw-r--r--doc/generated/examples/factories_Execute_1.xml2
-rw-r--r--doc/generated/examples/factories_Mkdir_1.xml2
-rw-r--r--doc/generated/examples/factories_Move_1.xml2
-rw-r--r--doc/generated/examples/factories_Touch_1.xml2
-rw-r--r--doc/generated/examples/fileremoval_clean-ex1_1.xml4
-rw-r--r--doc/generated/examples/fileremoval_noclean-ex1_1.xml4
-rw-r--r--doc/generated/examples/fileremoval_precious-ex1_1.xml2
-rw-r--r--doc/generated/examples/hierarchy_Return_1.xml2
-rw-r--r--doc/generated/examples/hierarchy_ex1_1.xml2
-rw-r--r--doc/generated/examples/hierarchy_ex2_1.xml2
-rw-r--r--doc/generated/examples/hierarchy_ex3_1.xml2
-rw-r--r--doc/generated/examples/install_ex1_1.xml4
-rw-r--r--doc/generated/examples/install_ex2_1.xml4
-rw-r--r--doc/generated/examples/install_ex3_1.xml2
-rw-r--r--doc/generated/examples/install_ex4_1.xml2
-rw-r--r--doc/generated/examples/install_ex5_1.xml2
-rw-r--r--doc/generated/examples/java_JAVACLASSDIR_1.xml2
-rw-r--r--doc/generated/examples/java_RMIC_1.xml2
-rw-r--r--doc/generated/examples/java_jar1_1.xml2
-rw-r--r--doc/generated/examples/java_jar2_1.xml2
-rw-r--r--doc/generated/examples/java_java-classes_1.xml4
-rw-r--r--doc/generated/examples/java_java-classes_2.xml4
-rw-r--r--doc/generated/examples/java_java_1.xml2
-rw-r--r--doc/generated/examples/java_javah_1.xml2
-rw-r--r--doc/generated/examples/java_javah_file_1.xml2
-rw-r--r--doc/generated/examples/lesssimple_ex2_1.xml2
-rw-r--r--doc/generated/examples/lesssimple_ex3_1.xml2
-rw-r--r--doc/generated/examples/lesssimple_ex3_2.xml2
-rw-r--r--doc/generated/examples/lesssimple_ex4_1.xml2
-rw-r--r--doc/generated/examples/lesssimple_ex5_1.xml2
-rw-r--r--doc/generated/examples/lesssimple_target_1.xml2
-rw-r--r--doc/generated/examples/lesssimple_target_2.xml2
-rw-r--r--doc/generated/examples/libraries_SharedLibrary_1.xml2
-rw-r--r--doc/generated/examples/libraries_SharedLibrary_2.xml2
-rw-r--r--doc/generated/examples/libraries_ex1_1.xml2
-rw-r--r--doc/generated/examples/libraries_ex1_2.xml2
-rw-r--r--doc/generated/examples/libraries_ex2_1.xml2
-rw-r--r--doc/generated/examples/libraries_ex2_2.xml2
-rw-r--r--doc/generated/examples/libraries_ex3_1.xml2
-rw-r--r--doc/generated/examples/libraries_ex3_2.xml2
-rw-r--r--doc/generated/examples/libraries_objects_1.xml2
-rw-r--r--doc/generated/examples/mergeflags_MergeFlags1_1.xml2
-rw-r--r--doc/generated/examples/mergeflags_MergeFlags2_1.xml2
-rw-r--r--doc/generated/examples/mergeflags_MergeFlags3_1.xml2
-rw-r--r--doc/generated/examples/misc_Exit_1.xml4
-rw-r--r--doc/generated/examples/misc_FindFile1a_1.xml2
-rw-r--r--doc/generated/examples/misc_FindFile1b_1.xml2
-rw-r--r--doc/generated/examples/misc_FindFile1d_1.xml2
-rw-r--r--doc/generated/examples/misc_FindFile2_1.xml2
-rw-r--r--doc/generated/examples/misc_FindFile2_2.xml2
-rw-r--r--doc/generated/examples/misc_FindFile3_1.xml2
-rw-r--r--doc/generated/examples/misc_Flatten1_1.xml2
-rw-r--r--doc/generated/examples/misc_Flatten2_1.xml1
-rw-r--r--doc/generated/examples/nodes_GetBuildPath_1.xml2
-rw-r--r--doc/generated/examples/nodes_ex1_1.xml2
-rw-r--r--doc/generated/examples/nodes_ex1_2.xml2
-rw-r--r--doc/generated/examples/nodes_exists_1.xml2
-rw-r--r--doc/generated/examples/nodes_print_1.xml2
-rw-r--r--doc/generated/examples/nodes_print_2.xml2
-rw-r--r--doc/generated/examples/output_Progress-TARGET_1.xml2
-rw-r--r--doc/generated/examples/output_ex1_1.xml2
-rw-r--r--doc/generated/examples/output_ex2_1.xml2
-rw-r--r--doc/generated/examples/output_ex2_2.xml2
-rw-r--r--doc/generated/examples/output_gbf2_1.xml4
-rw-r--r--doc/generated/examples/parseflags_ex1_1.xml2
-rw-r--r--doc/generated/examples/parseflags_ex1_2.xml2
-rw-r--r--doc/generated/examples/parseflags_ex2_1.xml2
-rw-r--r--doc/generated/examples/parseflags_ex3_1.xml2
-rw-r--r--doc/generated/examples/parseflags_ex4_1.xml2
-rw-r--r--doc/generated/examples/repositories_CPPPATH3_1.xml2
-rw-r--r--doc/generated/examples/repositories_CPPPATH_1.xml2
-rw-r--r--doc/generated/examples/repositories_ex1_1.xml2
-rw-r--r--doc/generated/examples/repositories_ex2_1.xml2
-rw-r--r--doc/generated/examples/repositories_ex3_1.xml2
-rw-r--r--doc/generated/examples/repositories_ex4_1.xml2
-rw-r--r--doc/generated/examples/repositories_quote1_1.xml2
-rw-r--r--doc/generated/examples/separate_builddir_1.xml2
-rw-r--r--doc/generated/examples/separate_builddir_sconscript_1.xml2
-rw-r--r--doc/generated/examples/separate_duplicate0_1.xml2
-rw-r--r--doc/generated/examples/separate_ex1_1.xml2
-rw-r--r--doc/generated/examples/separate_glob_builddir_sconscript_1.xml2
-rw-r--r--doc/generated/examples/sideeffect_parallel_1.xml2
-rw-r--r--doc/generated/examples/sideeffect_shared_1.xml2
-rw-r--r--doc/generated/examples/sideeffect_simple_1.xml2
-rw-r--r--doc/generated/examples/simple_Object_1.xml2
-rw-r--r--doc/generated/examples/simple_Object_2.xml2
-rw-r--r--doc/generated/examples/simple_clean_1.xml4
-rw-r--r--doc/generated/examples/simple_clean_2.xml4
-rw-r--r--doc/generated/examples/simple_declarative_1.xml2
-rw-r--r--doc/generated/examples/simple_ex1_1.xml2
-rw-r--r--doc/generated/examples/simple_ex1_2.xml2
-rw-r--r--doc/generated/examples/simple_ex1_3.xml2
-rw-r--r--doc/generated/examples/simple_ex1_4.xml2
-rw-r--r--doc/generated/examples/simple_java_1.xml2
-rw-r--r--doc/generated/examples/sourcecode_bitkeeper_1.xml2
-rw-r--r--doc/generated/examples/sourcecode_cvs_1.xml2
-rw-r--r--doc/generated/examples/sourcecode_rcs_1.xml2
-rw-r--r--doc/generated/examples/sourcecode_sccs_1.xml2
-rw-r--r--doc/generated/examples/tasks_ex1_1.xml2
-rw-r--r--doc/generated/examples/troubleshoot_Dump_1.xml2
-rw-r--r--doc/generated/examples/troubleshoot_Dump_2.xml2
-rw-r--r--doc/generated/examples/troubleshoot_Dump_ENV_1.xml2
-rw-r--r--doc/generated/examples/troubleshoot_Dump_ENV_2.xml2
-rw-r--r--doc/generated/examples/troubleshoot_explain1_1.xml6
-rw-r--r--doc/generated/examples/troubleshoot_explain1_2.xml2
-rw-r--r--doc/generated/examples/troubleshoot_explain1_3.xml4
-rw-r--r--doc/generated/examples/troubleshoot_explain2_1.xml4
-rw-r--r--doc/generated/examples/troubleshoot_explain3_1.xml4
-rw-r--r--doc/generated/examples/troubleshoot_findlibs_1.xml2
-rw-r--r--doc/generated/examples/troubleshoot_stacktrace_1.xml1
-rw-r--r--doc/generated/examples/troubleshoot_stacktrace_2.xml1
-rw-r--r--doc/generated/examples/troubleshoot_taskmastertrace_1.xml2
-rw-r--r--doc/generated/examples/troubleshoot_tree1_1.xml2
-rw-r--r--doc/generated/examples/troubleshoot_tree1_2.xml2
-rw-r--r--doc/generated/examples/troubleshoot_tree1_3.xml2
-rw-r--r--doc/generated/examples/troubleshoot_tree1_4.xml2
-rw-r--r--doc/generated/examples/troubleshoot_tree1_5.xml2
-rw-r--r--doc/generated/examples/troubleshoot_tree1_6.xml2
-rw-r--r--doc/generated/examples/troubleshoot_tree2_1.xml2
-rw-r--r--doc/generated/examples/troubleshoot_tree2_2.xml2
-rw-r--r--doc/generated/examples/variants_ex_1.xml2
-rw-r--r--doc/generated/examples/variants_ex_2.xml2
-rw-r--r--doc/generated/tools.gen12
-rw-r--r--doc/generated/tools.mod4
-rw-r--r--doc/generated/variables.gen56
-rw-r--r--doc/generated/variables.mod4
-rw-r--r--src/Announce.txt2
-rw-r--r--src/CHANGES.txt4
-rw-r--r--src/RELEASE.txt2
-rw-r--r--src/engine/SCons/Node/FS.py9
-rw-r--r--src/engine/SCons/Node/FSTests.py8
-rw-r--r--src/engine/SCons/Node/__init__.py2
-rw-r--r--src/engine/SCons/Tool/MSCommon/vc.py4
-rw-r--r--src/engine/SCons/Tool/qt.py2
-rw-r--r--src/setup.cfg3
248 files changed, 371 insertions, 384 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index 6941e1c..61e5012 100644
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -35,7 +35,7 @@ from TestCmd import PIPE
# here provides some independent verification that what we packaged
# conforms to what we expect.
-default_version = '3.0.0.alpha.20170614'
+default_version = '3.0.0.alpha.20170821'
python_version_unsupported = (2, 6, 0)
python_version_deprecated = (2, 7, 0)
diff --git a/README.rst b/README.rst
index dfbf117..faf8b10 100644
--- a/README.rst
+++ b/README.rst
@@ -492,14 +492,14 @@ following packages will be built::
build/dist/scons-2.5.0-1.noarch.rpm
build/dist/scons-2.5.0-1.src.rpm
build/dist/scons-2.5.0.linux-i686.tar.gz
- build/dist/scons-3.0.0.alpha.20170614.tar.gz
- build/dist/scons-3.0.0.alpha.20170614.win32.exe
- build/dist/scons-3.0.0.alpha.20170614.zip
- build/dist/scons-doc-3.0.0.alpha.20170614.tar.gz
- build/dist/scons-local-3.0.0.alpha.20170614.tar.gz
- build/dist/scons-local-3.0.0.alpha.20170614.zip
- build/dist/scons-src-3.0.0.alpha.20170614.tar.gz
- build/dist/scons-src-3.0.0.alpha.20170614.zip
+ build/dist/scons-3.0.0.alpha.20170821.tar.gz
+ build/dist/scons-3.0.0.alpha.20170821.win32.exe
+ build/dist/scons-3.0.0.alpha.20170821.zip
+ build/dist/scons-doc-3.0.0.alpha.20170821.tar.gz
+ build/dist/scons-local-3.0.0.alpha.20170821.tar.gz
+ build/dist/scons-local-3.0.0.alpha.20170821.zip
+ build/dist/scons-src-3.0.0.alpha.20170821.tar.gz
+ build/dist/scons-src-3.0.0.alpha.20170821.zip
build/dist/scons_3.0.0.alpha.20170614-1_all.deb
The SConstruct file is supposed to be smart enough to avoid trying to build
diff --git a/SConstruct b/SConstruct
index bfd12ca..2e17382 100644
--- a/SConstruct
+++ b/SConstruct
@@ -46,7 +46,7 @@ import time
import bootstrap
project = 'scons'
-default_version = '3.0.0.alpha.20170614'
+default_version = '3.0.0.alpha.20170821'
copyright = "Copyright (c) %s The SCons Foundation" % copyright_years
platform = distutils.util.get_platform()
diff --git a/doc/generated/examples/EnumVariable_map_1.xml b/doc/generated/examples/EnumVariable_map_1.xml
index 657b142..4380be0 100644
--- a/doc/generated/examples/EnumVariable_map_1.xml
+++ b/doc/generated/examples/EnumVariable_map_1.xml
@@ -1,4 +1,4 @@
<?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 -Q COLOR=navy foo.o</userinput>
-[?1034hcc -o foo.o -c -DCOLOR="blue" foo.c
+cc -o foo.o -c -DCOLOR="blue" foo.c
</screen>
diff --git a/doc/generated/examples/addmethod_ex1_1.xml b/doc/generated/examples/addmethod_ex1_1.xml
index febdb62..84dfd20 100644
--- a/doc/generated/examples/addmethod_ex1_1.xml
+++ b/doc/generated/examples/addmethod_ex1_1.xml
@@ -1,6 +1,6 @@
<?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 -Q /</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
cc -o hello hello.o
Install file: "hello" as "/usr/bin/hello"
Install file: "hello" as "install/bin/hello"
diff --git a/doc/generated/examples/addmethod_ex2_1.xml b/doc/generated/examples/addmethod_ex2_1.xml
index 2485697..3930341 100644
--- a/doc/generated/examples/addmethod_ex2_1.xml
+++ b/doc/generated/examples/addmethod_ex2_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hcc -o test_stuff.o -c test_stuff.c
+cc -o test_stuff.o -c test_stuff.c
cc -o tests/test_stuff test_stuff.o
</screen>
diff --git a/doc/generated/examples/addmethod_ex2_2.xml b/doc/generated/examples/addmethod_ex2_2.xml
index d2c8984..15ae6e0 100644
--- a/doc/generated/examples/addmethod_ex2_2.xml
+++ b/doc/generated/examples/addmethod_ex2_2.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hrc /fores.res res.rc
+rc /fores.res res.rc
cl /Fotest_stuff.obj /c test_stuff.c /nologo
link /nologo /OUT:tests\test_stuff.exe test_stuff.obj res.res
embedManifestExeCheck(target, source, env)
diff --git a/doc/generated/examples/alias_ex1_1.xml b/doc/generated/examples/alias_ex1_1.xml
index 78215b2..3ee3f1b 100644
--- a/doc/generated/examples/alias_ex1_1.xml
+++ b/doc/generated/examples/alias_ex1_1.xml
@@ -1,6 +1,6 @@
<?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 -Q install</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
cc -o hello hello.o
Install file: "hello" as "/usr/bin/hello"
</screen>
diff --git a/doc/generated/examples/alias_ex2_1.xml b/doc/generated/examples/alias_ex2_1.xml
index ac31b8a..3fa7dfd 100644
--- a/doc/generated/examples/alias_ex2_1.xml
+++ b/doc/generated/examples/alias_ex2_1.xml
@@ -1,22 +1,22 @@
<?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 -Q install-bin</userinput>
-[?1034hcc -o foo.o -c foo.c
+cc -o foo.o -c foo.c
cc -o foo foo.o
Install file: "foo" as "/usr/bin/foo"
% <userinput>scons -Q install-lib</userinput>
-[?1034hcc -o bar.o -c bar.c
+cc -o bar.o -c bar.c
ar rc libbar.a bar.o
ranlib libbar.a
Install file: "libbar.a" as "/usr/lib/libbar.a"
% <userinput>scons -Q -c /</userinput>
-[?1034hRemoved foo.o
+Removed foo.o
Removed foo
Removed /usr/bin/foo
Removed bar.o
Removed libbar.a
Removed /usr/lib/libbar.a
% <userinput>scons -Q install</userinput>
-[?1034hcc -o foo.o -c foo.c
+cc -o foo.o -c foo.c
cc -o foo foo.o
Install file: "foo" as "/usr/bin/foo"
cc -o bar.o -c bar.c
diff --git a/doc/generated/examples/buildersbuiltin_ex1_1.xml b/doc/generated/examples/buildersbuiltin_ex1_1.xml
index a875fba..74cc779 100644
--- a/doc/generated/examples/buildersbuiltin_ex1_1.xml
+++ b/doc/generated/examples/buildersbuiltin_ex1_1.xml
@@ -1,5 +1,5 @@
<?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 -Q .</userinput>
-[?1034htar -c -f out1.tar file1 file2
+tar -c -f out1.tar file1 file2
tar -c -f out2.tar directory
</screen>
diff --git a/doc/generated/examples/buildersbuiltin_ex2_1.xml b/doc/generated/examples/buildersbuiltin_ex2_1.xml
index a019372..6c66d7b 100644
--- a/doc/generated/examples/buildersbuiltin_ex2_1.xml
+++ b/doc/generated/examples/buildersbuiltin_ex2_1.xml
@@ -1,4 +1,4 @@
<?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 -Q .</userinput>
-[?1034htar -c -z -f out.tar.gz directory
+tar -c -z -f out.tar.gz directory
</screen>
diff --git a/doc/generated/examples/buildersbuiltin_ex3_1.xml b/doc/generated/examples/buildersbuiltin_ex3_1.xml
index 1842916..4d281e5 100644
--- a/doc/generated/examples/buildersbuiltin_ex3_1.xml
+++ b/doc/generated/examples/buildersbuiltin_ex3_1.xml
@@ -1,4 +1,4 @@
<?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 -Q .</userinput>
-[?1034htar -c -z -f out.tgz directory
+tar -c -z -f out.tgz directory
</screen>
diff --git a/doc/generated/examples/buildersbuiltin_ex4_1.xml b/doc/generated/examples/buildersbuiltin_ex4_1.xml
index 90a8f6e..856f024 100644
--- a/doc/generated/examples/buildersbuiltin_ex4_1.xml
+++ b/doc/generated/examples/buildersbuiltin_ex4_1.xml
@@ -1,4 +1,4 @@
<?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 -Q .</userinput>
-[?1034hzip(["out.zip"], ["file1", "file2"])
+zip(["out.zip"], ["file1", "file2"])
</screen>
diff --git a/doc/generated/examples/buildersbuiltin_libs_1.xml b/doc/generated/examples/buildersbuiltin_libs_1.xml
index 0610155..8e1ee49 100644
--- a/doc/generated/examples/buildersbuiltin_libs_1.xml
+++ b/doc/generated/examples/buildersbuiltin_libs_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcc -o goodbye.o -c goodbye.c
+cc -o goodbye.o -c goodbye.c
cc -o hello.o -c hello.c
cc -o hello hello.o goodbye.o -L/usr/dir1 -Ldir2 -lfoo1 -lfoo2
</screen>
diff --git a/doc/generated/examples/buildersbuiltin_libs_2.xml b/doc/generated/examples/buildersbuiltin_libs_2.xml
index 6786cca..41a9c1e 100644
--- a/doc/generated/examples/buildersbuiltin_libs_2.xml
+++ b/doc/generated/examples/buildersbuiltin_libs_2.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcl /Fogoodbye.obj /c goodbye.c /nologo
+cl /Fogoodbye.obj /c goodbye.c /nologo
cl /Fohello.obj /c hello.c /nologo
link /nologo /OUT:hello.exe /LIBPATH:\usr\dir1 /LIBPATH:dir2 foo1.lib foo2.lib hello.obj goodbye.obj
embedManifestExeCheck(target, source, env)
diff --git a/doc/generated/examples/builderscommands_ex1_1.xml b/doc/generated/examples/builderscommands_ex1_1.xml
index d9af418..8782773 100644
--- a/doc/generated/examples/builderscommands_ex1_1.xml
+++ b/doc/generated/examples/builderscommands_ex1_1.xml
@@ -1,4 +1,4 @@
<?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 -Q</userinput>
-[?1034hsed 's/x/y/' &lt; foo.in &gt; foo.out
+sed 's/x/y/' &lt; foo.in &gt; foo.out
</screen>
diff --git a/doc/generated/examples/builderscommands_ex2_1.xml b/doc/generated/examples/builderscommands_ex2_1.xml
index dc689d0..3fc1dde 100644
--- a/doc/generated/examples/builderscommands_ex2_1.xml
+++ b/doc/generated/examples/builderscommands_ex2_1.xml
@@ -1,4 +1,4 @@
<?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 -Q</userinput>
-[?1034hbuild(["foo.out"], ["foo.in"])
+build(["foo.out"], ["foo.in"])
</screen>
diff --git a/doc/generated/examples/builderswriting_MY_EMITTER_1.xml b/doc/generated/examples/builderswriting_MY_EMITTER_1.xml
index 4dc10f5..440b105 100644
--- a/doc/generated/examples/builderswriting_MY_EMITTER_1.xml
+++ b/doc/generated/examples/builderswriting_MY_EMITTER_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hmy_command file1.input modify1.in &gt; file1.foo
+my_command file1.input modify1.in &gt; file1.foo
my_command file2.input modify2.in &gt; file2.foo
</screen>
diff --git a/doc/generated/examples/builderswriting_ex1_1.xml b/doc/generated/examples/builderswriting_ex1_1.xml
index d2ba489..cefcfa2 100644
--- a/doc/generated/examples/builderswriting_ex1_1.xml
+++ b/doc/generated/examples/builderswriting_ex1_1.xml
@@ -1,4 +1,4 @@
<?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 -Q</userinput>
-[?1034hfoobuild &lt; file.input &gt; file.foo
+foobuild &lt; file.input &gt; file.foo
</screen>
diff --git a/doc/generated/examples/builderswriting_ex2_1.xml b/doc/generated/examples/builderswriting_ex2_1.xml
index 254cfc0..445dfb0 100644
--- a/doc/generated/examples/builderswriting_ex2_1.xml
+++ b/doc/generated/examples/builderswriting_ex2_1.xml
@@ -3,5 +3,4 @@
AttributeError: 'SConsEnvironment' object has no attribute 'Program':
File "/home/my/project/SConstruct", line 4:
env.Program('hello.c')
-[?1034h
</screen>
diff --git a/doc/generated/examples/builderswriting_ex3_1.xml b/doc/generated/examples/builderswriting_ex3_1.xml
index 0b2f504..2d8bcac 100644
--- a/doc/generated/examples/builderswriting_ex3_1.xml
+++ b/doc/generated/examples/builderswriting_ex3_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hfoobuild &lt; file.input &gt; file.foo
+foobuild &lt; file.input &gt; file.foo
cc -o hello.o -c hello.c
cc -o hello hello.o
</screen>
diff --git a/doc/generated/examples/builderswriting_ex4_1.xml b/doc/generated/examples/builderswriting_ex4_1.xml
index 04b511b..cc71b19 100644
--- a/doc/generated/examples/builderswriting_ex4_1.xml
+++ b/doc/generated/examples/builderswriting_ex4_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hfoobuild &lt; file1.input &gt; file1.foo
+foobuild &lt; file1.input &gt; file1.foo
foobuild &lt; file2.input &gt; file2.foo
</screen>
diff --git a/doc/generated/examples/builderswriting_ex5_1.xml b/doc/generated/examples/builderswriting_ex5_1.xml
index b1430bd..d0aa83b 100644
--- a/doc/generated/examples/builderswriting_ex5_1.xml
+++ b/doc/generated/examples/builderswriting_ex5_1.xml
@@ -1,4 +1,4 @@
<?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 -Q</userinput>
-[?1034hbuild_function(["file.foo"], ["file.input"])
+build_function(["file.foo"], ["file.input"])
</screen>
diff --git a/doc/generated/examples/builderswriting_ex6_1.xml b/doc/generated/examples/builderswriting_ex6_1.xml
index d2ba489..cefcfa2 100644
--- a/doc/generated/examples/builderswriting_ex6_1.xml
+++ b/doc/generated/examples/builderswriting_ex6_1.xml
@@ -1,4 +1,4 @@
<?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 -Q</userinput>
-[?1034hfoobuild &lt; file.input &gt; file.foo
+foobuild &lt; file.input &gt; file.foo
</screen>
diff --git a/doc/generated/examples/builderswriting_ex7_1.xml b/doc/generated/examples/builderswriting_ex7_1.xml
index 25c2950..f14d598 100644
--- a/doc/generated/examples/builderswriting_ex7_1.xml
+++ b/doc/generated/examples/builderswriting_ex7_1.xml
@@ -1,4 +1,4 @@
<?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 -Q</userinput>
-[?1034hfoobuild file.foo new_target - file.input new_source
+foobuild file.foo new_target - file.input new_source
</screen>
diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml
index 8d5ccb4..3798ec9 100644
--- a/doc/generated/examples/caching_ex-random_1.xml
+++ b/doc/generated/examples/caching_ex-random_1.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">% <userinput>scons -Q</userinput>
-[?1034hcc -o f3.o -c f3.c
-cc -o f4.o -c f4.c
+cc -o f3.o -c f3.c
cc -o f5.o -c f5.c
cc -o f1.o -c f1.c
cc -o f2.o -c f2.c
+cc -o f4.o -c f4.c
cc -o prog f1.o f2.o f3.o f4.o f5.o
</screen>
diff --git a/doc/generated/examples/caching_ex1_1.xml b/doc/generated/examples/caching_ex1_1.xml
index 8701e3a..38eaf82 100644
--- a/doc/generated/examples/caching_ex1_1.xml
+++ b/doc/generated/examples/caching_ex1_1.xml
@@ -1,11 +1,11 @@
<?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 -Q</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
cc -o hello hello.o
% <userinput>scons -Q -c</userinput>
-[?1034hRemoved hello.o
+Removed hello.o
Removed hello
% <userinput>scons -Q</userinput>
-[?1034hRetrieved `hello.o' from cache
+Retrieved `hello.o' from cache
Retrieved `hello' from cache
</screen>
diff --git a/doc/generated/examples/caching_ex1_2.xml b/doc/generated/examples/caching_ex1_2.xml
index a31e69b..2f0bcde 100644
--- a/doc/generated/examples/caching_ex1_2.xml
+++ b/doc/generated/examples/caching_ex1_2.xml
@@ -1,11 +1,11 @@
<?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 -Q</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
cc -o hello hello.o
% <userinput>scons -Q -c</userinput>
-[?1034hRemoved hello.o
+Removed hello.o
Removed hello
% <userinput>scons -Q --cache-show</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
cc -o hello hello.o
</screen>
diff --git a/doc/generated/examples/caching_ex1_4.xml b/doc/generated/examples/caching_ex1_4.xml
index 46a2642..922f1b6 100644
--- a/doc/generated/examples/caching_ex1_4.xml
+++ b/doc/generated/examples/caching_ex1_4.xml
@@ -1,17 +1,17 @@
<?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 -Q</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
cc -o hello hello.o
% <userinput>scons -Q -c</userinput>
-[?1034hRemoved hello.o
+Removed hello.o
Removed hello
% <userinput>scons -Q</userinput>
-[?1034hRetrieved `hello.o' from cache
+Retrieved `hello.o' from cache
Retrieved `hello' from cache
% <userinput>scons -Q -c</userinput>
-[?1034hRemoved hello.o
+Removed hello.o
Removed hello
% <userinput>scons -Q --cache-disable</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
cc -o hello hello.o
</screen>
diff --git a/doc/generated/examples/caching_ex1_5.xml b/doc/generated/examples/caching_ex1_5.xml
index 69804dc..968727f 100644
--- a/doc/generated/examples/caching_ex1_5.xml
+++ b/doc/generated/examples/caching_ex1_5.xml
@@ -1,15 +1,15 @@
<?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 -Q --cache-disable</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
cc -o hello hello.o
% <userinput>scons -Q -c</userinput>
-[?1034hRemoved hello.o
+Removed hello.o
Removed hello
% <userinput>scons -Q --cache-disable</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
cc -o hello hello.o
% <userinput>scons -Q --cache-force</userinput>
-[?1034hscons: `.' is up to date.
+scons: `.' is up to date.
% <userinput>scons -Q</userinput>
-[?1034hscons: `.' is up to date.
+scons: `.' is up to date.
</screen>
diff --git a/doc/generated/examples/commandline_ARGLIST_1.xml b/doc/generated/examples/commandline_ARGLIST_1.xml
index 86a6d9c..e094bc0 100644
--- a/doc/generated/examples/commandline_ARGLIST_1.xml
+++ b/doc/generated/examples/commandline_ARGLIST_1.xml
@@ -1,6 +1,6 @@
<?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 -Q define=FOO</userinput>
-[?1034hcc -o prog.o -c -DFOO prog.c
+cc -o prog.o -c -DFOO prog.c
% <userinput>scons -Q define=FOO define=BAR</userinput>
-[?1034hcc -o prog.o -c -DFOO -DBAR prog.c
+cc -o prog.o -c -DFOO -DBAR prog.c
</screen>
diff --git a/doc/generated/examples/commandline_ARGUMENTS_1.xml b/doc/generated/examples/commandline_ARGUMENTS_1.xml
index 7bde474..6aa4ed2 100644
--- a/doc/generated/examples/commandline_ARGUMENTS_1.xml
+++ b/doc/generated/examples/commandline_ARGUMENTS_1.xml
@@ -1,12 +1,12 @@
<?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 -Q debug=0</userinput>
-[?1034hcc -o prog.o -c prog.c
+cc -o prog.o -c prog.c
cc -o prog prog.o
% <userinput>scons -Q debug=0</userinput>
-[?1034hscons: `.' is up to date.
+scons: `.' is up to date.
% <userinput>scons -Q debug=1</userinput>
-[?1034hcc -o prog.o -c -g prog.c
+cc -o prog.o -c -g prog.c
cc -o prog prog.o
% <userinput>scons -Q debug=1</userinput>
-[?1034hscons: `.' is up to date.
+scons: `.' is up to date.
</screen>
diff --git a/doc/generated/examples/commandline_AddOption_1.xml b/doc/generated/examples/commandline_AddOption_1.xml
index d221713..55df25a 100644
--- a/doc/generated/examples/commandline_AddOption_1.xml
+++ b/doc/generated/examples/commandline_AddOption_1.xml
@@ -1,4 +1,4 @@
<?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 -Q -n</userinput>
-[?1034hInstall file: "foo.in" as "/usr/bin/foo.in"
+Install file: "foo.in" as "/usr/bin/foo.in"
</screen>
diff --git a/doc/generated/examples/commandline_AddOption_2.xml b/doc/generated/examples/commandline_AddOption_2.xml
index 979bb70..7d0b978 100644
--- a/doc/generated/examples/commandline_AddOption_2.xml
+++ b/doc/generated/examples/commandline_AddOption_2.xml
@@ -1,4 +1,4 @@
<?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 -Q -n --prefix=/tmp/install</userinput>
-[?1034hInstall file: "foo.in" as "/tmp/install/usr/bin/foo.in"
+Install file: "foo.in" as "/tmp/install/usr/bin/foo.in"
</screen>
diff --git a/doc/generated/examples/commandline_BUILD_TARGETS_1_1.xml b/doc/generated/examples/commandline_BUILD_TARGETS_1_1.xml
index 8d23d0b..bd51961 100644
--- a/doc/generated/examples/commandline_BUILD_TARGETS_1_1.xml
+++ b/doc/generated/examples/commandline_BUILD_TARGETS_1_1.xml
@@ -1,14 +1,14 @@
<?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 -Q</userinput>
-[?1034hBUILD_TARGETS is ['prog1']
+BUILD_TARGETS is ['prog1']
cc -o prog1.o -c prog1.c
cc -o prog1 prog1.o
% <userinput>scons -Q prog2</userinput>
-[?1034hBUILD_TARGETS is ['prog2']
+BUILD_TARGETS is ['prog2']
cc -o prog2.o -c prog2.c
cc -o prog2 prog2.o
% <userinput>scons -Q -c .</userinput>
-[?1034hBUILD_TARGETS is ['.']
+BUILD_TARGETS is ['.']
Removed prog1.o
Removed prog1
Removed prog2.o
diff --git a/doc/generated/examples/commandline_BoolVariable_1.xml b/doc/generated/examples/commandline_BoolVariable_1.xml
index 5cffe9e..e4c1792 100644
--- a/doc/generated/examples/commandline_BoolVariable_1.xml
+++ b/doc/generated/examples/commandline_BoolVariable_1.xml
@@ -1,4 +1,4 @@
<?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 -Q RELEASE=yes foo.o</userinput>
-[?1034hcc -o foo.o -c -DRELEASE_BUILD=True foo.c
+cc -o foo.o -c -DRELEASE_BUILD=True foo.c
</screen>
diff --git a/doc/generated/examples/commandline_BoolVariable_2.xml b/doc/generated/examples/commandline_BoolVariable_2.xml
index d988ce9..dc1e068 100644
--- a/doc/generated/examples/commandline_BoolVariable_2.xml
+++ b/doc/generated/examples/commandline_BoolVariable_2.xml
@@ -1,4 +1,4 @@
<?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 -Q RELEASE=t foo.o</userinput>
-[?1034hcc -o foo.o -c -DRELEASE_BUILD=True foo.c
+cc -o foo.o -c -DRELEASE_BUILD=True foo.c
</screen>
diff --git a/doc/generated/examples/commandline_BoolVariable_3.xml b/doc/generated/examples/commandline_BoolVariable_3.xml
index 9616e94..0750fb5 100644
--- a/doc/generated/examples/commandline_BoolVariable_3.xml
+++ b/doc/generated/examples/commandline_BoolVariable_3.xml
@@ -1,4 +1,4 @@
<?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 -Q RELEASE=no foo.o</userinput>
-[?1034hcc -o foo.o -c -DRELEASE_BUILD=False foo.c
+cc -o foo.o -c -DRELEASE_BUILD=False foo.c
</screen>
diff --git a/doc/generated/examples/commandline_BoolVariable_4.xml b/doc/generated/examples/commandline_BoolVariable_4.xml
index b49a303..84e4639 100644
--- a/doc/generated/examples/commandline_BoolVariable_4.xml
+++ b/doc/generated/examples/commandline_BoolVariable_4.xml
@@ -1,4 +1,4 @@
<?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 -Q RELEASE=f foo.o</userinput>
-[?1034hcc -o foo.o -c -DRELEASE_BUILD=False foo.c
+cc -o foo.o -c -DRELEASE_BUILD=False foo.c
</screen>
diff --git a/doc/generated/examples/commandline_BoolVariable_5.xml b/doc/generated/examples/commandline_BoolVariable_5.xml
index f987aac..81f1d4e 100644
--- a/doc/generated/examples/commandline_BoolVariable_5.xml
+++ b/doc/generated/examples/commandline_BoolVariable_5.xml
@@ -4,5 +4,4 @@
scons: *** Error converting option: RELEASE
Invalid value for boolean option: bad_value
File "/home/my/project/SConstruct", line 4, in &lt;module&gt;
-[?1034h
</screen>
diff --git a/doc/generated/examples/commandline_COMMAND_LINE_TARGETS_1.xml b/doc/generated/examples/commandline_COMMAND_LINE_TARGETS_1.xml
index 096223d..1812f74 100644
--- a/doc/generated/examples/commandline_COMMAND_LINE_TARGETS_1.xml
+++ b/doc/generated/examples/commandline_COMMAND_LINE_TARGETS_1.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">% <userinput>scons -Q</userinput>
-[?1034hcc -o foo.o -c foo.c
+cc -o foo.o -c foo.c
cc -o foo foo.o
% <userinput>scons -Q bar</userinput>
-[?1034hDon't forget to copy `bar' to the archive!
+Don't forget to copy `bar' to the archive!
cc -o bar.o -c bar.c
cc -o bar bar.o
</screen>
diff --git a/doc/generated/examples/commandline_DEFAULT_TARGETS_1_1.xml b/doc/generated/examples/commandline_DEFAULT_TARGETS_1_1.xml
index 529aecb..f92f160 100644
--- a/doc/generated/examples/commandline_DEFAULT_TARGETS_1_1.xml
+++ b/doc/generated/examples/commandline_DEFAULT_TARGETS_1_1.xml
@@ -1,6 +1,6 @@
<?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>
-[?1034hscons: Reading SConscript files ...
+scons: Reading SConscript files ...
DEFAULT_TARGETS is ['prog1']
scons: done reading SConscript files.
scons: Building targets ...
diff --git a/doc/generated/examples/commandline_DEFAULT_TARGETS_2_1.xml b/doc/generated/examples/commandline_DEFAULT_TARGETS_2_1.xml
index d275158..01e953b 100644
--- a/doc/generated/examples/commandline_DEFAULT_TARGETS_2_1.xml
+++ b/doc/generated/examples/commandline_DEFAULT_TARGETS_2_1.xml
@@ -1,6 +1,6 @@
<?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>
-[?1034hscons: Reading SConscript files ...
+scons: Reading SConscript files ...
DEFAULT_TARGETS is now ['prog1']
DEFAULT_TARGETS is now ['prog1', 'prog2']
scons: done reading SConscript files.
diff --git a/doc/generated/examples/commandline_Default1_1.xml b/doc/generated/examples/commandline_Default1_1.xml
index 9d8ca6c..18008d8 100644
--- a/doc/generated/examples/commandline_Default1_1.xml
+++ b/doc/generated/examples/commandline_Default1_1.xml
@@ -1,10 +1,10 @@
<?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 -Q</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
cc -o hello hello.o
% <userinput>scons -Q</userinput>
-[?1034hscons: `hello' is up to date.
+scons: `hello' is up to date.
% <userinput>scons -Q goodbye</userinput>
-[?1034hcc -o goodbye.o -c goodbye.c
+cc -o goodbye.o -c goodbye.c
cc -o goodbye goodbye.o
</screen>
diff --git a/doc/generated/examples/commandline_Default1_2.xml b/doc/generated/examples/commandline_Default1_2.xml
index 842b9fa..0f1a93e 100644
--- a/doc/generated/examples/commandline_Default1_2.xml
+++ b/doc/generated/examples/commandline_Default1_2.xml
@@ -1,6 +1,6 @@
<?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 -Q .</userinput>
-[?1034hcc -o goodbye.o -c goodbye.c
+cc -o goodbye.o -c goodbye.c
cc -o goodbye goodbye.o
cc -o hello.o -c hello.c
cc -o hello hello.o
diff --git a/doc/generated/examples/commandline_Default2_1.xml b/doc/generated/examples/commandline_Default2_1.xml
index c62e80c..606ed67 100644
--- a/doc/generated/examples/commandline_Default2_1.xml
+++ b/doc/generated/examples/commandline_Default2_1.xml
@@ -1,10 +1,10 @@
<?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 -Q</userinput>
-[?1034hcc -o prog1.o -c prog1.c
+cc -o prog1.o -c prog1.c
cc -o prog1 prog1.o
cc -o prog3.o -c prog3.c
cc -o prog3 prog3.o
% <userinput>scons -Q .</userinput>
-[?1034hcc -o prog2.o -c prog2.c
+cc -o prog2.o -c prog2.c
cc -o prog2 prog2.o
</screen>
diff --git a/doc/generated/examples/commandline_Default3_1.xml b/doc/generated/examples/commandline_Default3_1.xml
index cff7a20..d18575c 100644
--- a/doc/generated/examples/commandline_Default3_1.xml
+++ b/doc/generated/examples/commandline_Default3_1.xml
@@ -1,12 +1,12 @@
<?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 -Q</userinput>
-[?1034hcc -o prog1/foo.o -c prog1/foo.c
+cc -o prog1/foo.o -c prog1/foo.c
cc -o prog1/main.o -c prog1/main.c
cc -o prog1/main prog1/main.o prog1/foo.o
% <userinput>scons -Q</userinput>
-[?1034hscons: `prog1' is up to date.
+scons: `prog1' is up to date.
% <userinput>scons -Q .</userinput>
-[?1034hcc -o prog2/bar.o -c prog2/bar.c
+cc -o prog2/bar.o -c prog2/bar.c
cc -o prog2/main.o -c prog2/main.c
cc -o prog2/main prog2/main.o prog2/bar.o
</screen>
diff --git a/doc/generated/examples/commandline_Default4_1.xml b/doc/generated/examples/commandline_Default4_1.xml
index 098d90e..35e0b10 100644
--- a/doc/generated/examples/commandline_Default4_1.xml
+++ b/doc/generated/examples/commandline_Default4_1.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">% <userinput>scons -Q</userinput>
scons: *** No targets specified and no Default() targets found. Stop.
-[?1034hFound nothing to build
+Found nothing to build
% <userinput>scons -Q .</userinput>
-[?1034hcc -o prog1.o -c prog1.c
+cc -o prog1.o -c prog1.c
cc -o prog1 prog1.o
cc -o prog2.o -c prog2.c
cc -o prog2 prog2.o
diff --git a/doc/generated/examples/commandline_EnumVariable_1.xml b/doc/generated/examples/commandline_EnumVariable_1.xml
index 31943ea..d658f69 100644
--- a/doc/generated/examples/commandline_EnumVariable_1.xml
+++ b/doc/generated/examples/commandline_EnumVariable_1.xml
@@ -1,8 +1,8 @@
<?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 -Q COLOR=red foo.o</userinput>
-[?1034hcc -o foo.o -c -DCOLOR="red" foo.c
+cc -o foo.o -c -DCOLOR="red" foo.c
% <userinput>scons -Q COLOR=blue foo.o</userinput>
-[?1034hcc -o foo.o -c -DCOLOR="blue" foo.c
+cc -o foo.o -c -DCOLOR="blue" foo.c
% <userinput>scons -Q COLOR=green foo.o</userinput>
-[?1034hcc -o foo.o -c -DCOLOR="green" foo.c
+cc -o foo.o -c -DCOLOR="green" foo.c
</screen>
diff --git a/doc/generated/examples/commandline_EnumVariable_2.xml b/doc/generated/examples/commandline_EnumVariable_2.xml
index 1e28144..a8a18df 100644
--- a/doc/generated/examples/commandline_EnumVariable_2.xml
+++ b/doc/generated/examples/commandline_EnumVariable_2.xml
@@ -3,5 +3,4 @@
scons: *** Invalid value for option COLOR: magenta. Valid values are: ('red', 'green', 'blue')
File "/home/my/project/SConstruct", line 5, in &lt;module&gt;
-[?1034h
</screen>
diff --git a/doc/generated/examples/commandline_EnumVariable_3.xml b/doc/generated/examples/commandline_EnumVariable_3.xml
index 73510cb..bb9a6d5 100644
--- a/doc/generated/examples/commandline_EnumVariable_3.xml
+++ b/doc/generated/examples/commandline_EnumVariable_3.xml
@@ -3,15 +3,12 @@
scons: *** Invalid value for option COLOR: Red. Valid values are: ('red', 'green', 'blue')
File "/home/my/project/SConstruct", line 5, in &lt;module&gt;
-[?1034h
% <userinput>scons -Q COLOR=BLUE foo.o</userinput>
scons: *** Invalid value for option COLOR: BLUE. Valid values are: ('red', 'green', 'blue')
File "/home/my/project/SConstruct", line 5, in &lt;module&gt;
-[?1034h
% <userinput>scons -Q COLOR=nAvY foo.o</userinput>
scons: *** Invalid value for option COLOR: nAvY. Valid values are: ('red', 'green', 'blue')
File "/home/my/project/SConstruct", line 5, in &lt;module&gt;
-[?1034h
</screen>
diff --git a/doc/generated/examples/commandline_EnumVariable_ic1_1.xml b/doc/generated/examples/commandline_EnumVariable_ic1_1.xml
index 0c8b86a..db786e5 100644
--- a/doc/generated/examples/commandline_EnumVariable_ic1_1.xml
+++ b/doc/generated/examples/commandline_EnumVariable_ic1_1.xml
@@ -1,10 +1,10 @@
<?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 -Q COLOR=Red foo.o</userinput>
-[?1034hcc -o foo.o -c -DCOLOR="Red" foo.c
+cc -o foo.o -c -DCOLOR="Red" foo.c
% <userinput>scons -Q COLOR=BLUE foo.o</userinput>
-[?1034hcc -o foo.o -c -DCOLOR="BLUE" foo.c
+cc -o foo.o -c -DCOLOR="BLUE" foo.c
% <userinput>scons -Q COLOR=nAvY foo.o</userinput>
-[?1034hcc -o foo.o -c -DCOLOR="blue" foo.c
+cc -o foo.o -c -DCOLOR="blue" foo.c
% <userinput>scons -Q COLOR=green foo.o</userinput>
-[?1034hcc -o foo.o -c -DCOLOR="green" foo.c
+cc -o foo.o -c -DCOLOR="green" foo.c
</screen>
diff --git a/doc/generated/examples/commandline_EnumVariable_ic2_1.xml b/doc/generated/examples/commandline_EnumVariable_ic2_1.xml
index 4298d03..5596608 100644
--- a/doc/generated/examples/commandline_EnumVariable_ic2_1.xml
+++ b/doc/generated/examples/commandline_EnumVariable_ic2_1.xml
@@ -1,8 +1,8 @@
<?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 -Q COLOR=Red foo.o</userinput>
-[?1034hcc -o foo.o -c -DCOLOR="red" foo.c
+cc -o foo.o -c -DCOLOR="red" foo.c
% <userinput>scons -Q COLOR=nAvY foo.o</userinput>
-[?1034hcc -o foo.o -c -DCOLOR="blue" foo.c
+cc -o foo.o -c -DCOLOR="blue" foo.c
% <userinput>scons -Q COLOR=GREEN foo.o</userinput>
-[?1034hcc -o foo.o -c -DCOLOR="green" foo.c
+cc -o foo.o -c -DCOLOR="green" foo.c
</screen>
diff --git a/doc/generated/examples/commandline_ListVariable_1.xml b/doc/generated/examples/commandline_ListVariable_1.xml
index f88280c..6e245a3 100644
--- a/doc/generated/examples/commandline_ListVariable_1.xml
+++ b/doc/generated/examples/commandline_ListVariable_1.xml
@@ -1,6 +1,6 @@
<?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 -Q COLORS=red,blue foo.o</userinput>
-[?1034hcc -o foo.o -c -DCOLORS="red blue" foo.c
+cc -o foo.o -c -DCOLORS="red blue" foo.c
% <userinput>scons -Q COLORS=blue,green,red foo.o</userinput>
-[?1034hcc -o foo.o -c -DCOLORS="blue green red" foo.c
+cc -o foo.o -c -DCOLORS="blue green red" foo.c
</screen>
diff --git a/doc/generated/examples/commandline_ListVariable_2.xml b/doc/generated/examples/commandline_ListVariable_2.xml
index e287f2a..b964669 100644
--- a/doc/generated/examples/commandline_ListVariable_2.xml
+++ b/doc/generated/examples/commandline_ListVariable_2.xml
@@ -1,6 +1,6 @@
<?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 -Q COLORS=all foo.o</userinput>
-[?1034hcc -o foo.o -c -DCOLORS="red green blue" foo.c
+cc -o foo.o -c -DCOLORS="red green blue" foo.c
% <userinput>scons -Q COLORS=none foo.o</userinput>
-[?1034hcc -o foo.o -c -DCOLORS="" foo.c
+cc -o foo.o -c -DCOLORS="" foo.c
</screen>
diff --git a/doc/generated/examples/commandline_ListVariable_3.xml b/doc/generated/examples/commandline_ListVariable_3.xml
index d15105c..ae13d8b 100644
--- a/doc/generated/examples/commandline_ListVariable_3.xml
+++ b/doc/generated/examples/commandline_ListVariable_3.xml
@@ -4,5 +4,4 @@
scons: *** Error converting option: COLORS
Invalid value(s) for option: magenta
File "/home/my/project/SConstruct", line 5, in &lt;module&gt;
-[?1034h
</screen>
diff --git a/doc/generated/examples/commandline_PackageVariable_1.xml b/doc/generated/examples/commandline_PackageVariable_1.xml
index 8c14ab8..b83fd80 100644
--- a/doc/generated/examples/commandline_PackageVariable_1.xml
+++ b/doc/generated/examples/commandline_PackageVariable_1.xml
@@ -1,10 +1,10 @@
<?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 -Q foo.o</userinput>
-[?1034hcc -o foo.o -c -DPACKAGE="/opt/location" foo.c
+cc -o foo.o -c -DPACKAGE="/opt/location" foo.c
% <userinput>scons -Q PACKAGE=/usr/local/location foo.o</userinput>
-[?1034hcc -o foo.o -c -DPACKAGE="/usr/local/location" foo.c
+cc -o foo.o -c -DPACKAGE="/usr/local/location" foo.c
% <userinput>scons -Q PACKAGE=yes foo.o</userinput>
-[?1034hcc -o foo.o -c -DPACKAGE="True" foo.c
+cc -o foo.o -c -DPACKAGE="True" foo.c
% <userinput>scons -Q PACKAGE=no foo.o</userinput>
-[?1034hcc -o foo.o -c -DPACKAGE="False" foo.c
+cc -o foo.o -c -DPACKAGE="False" foo.c
</screen>
diff --git a/doc/generated/examples/commandline_PathVariable_1.xml b/doc/generated/examples/commandline_PathVariable_1.xml
index 346b284..81693b9 100644
--- a/doc/generated/examples/commandline_PathVariable_1.xml
+++ b/doc/generated/examples/commandline_PathVariable_1.xml
@@ -1,6 +1,6 @@
<?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 -Q foo.o</userinput>
-[?1034hcc -o foo.o -c -DCONFIG_FILE="/etc/my_config" foo.c
+cc -o foo.o -c -DCONFIG_FILE="/etc/my_config" foo.c
% <userinput>scons -Q CONFIG=/usr/local/etc/other_config foo.o</userinput>
-[?1034hscons: `foo.o' is up to date.
+scons: `foo.o' is up to date.
</screen>
diff --git a/doc/generated/examples/commandline_PathVariable_2.xml b/doc/generated/examples/commandline_PathVariable_2.xml
index c05dfb3..7dde5b1 100644
--- a/doc/generated/examples/commandline_PathVariable_2.xml
+++ b/doc/generated/examples/commandline_PathVariable_2.xml
@@ -3,5 +3,4 @@
scons: *** Path for option CONFIG does not exist: /does/not/exist
File "/home/my/project/SConstruct", line 6, in &lt;module&gt;
-[?1034h
</screen>
diff --git a/doc/generated/examples/commandline_SCONSFLAGS_1.xml b/doc/generated/examples/commandline_SCONSFLAGS_1.xml
index 9497ade..35e366c 100644
--- a/doc/generated/examples/commandline_SCONSFLAGS_1.xml
+++ b/doc/generated/examples/commandline_SCONSFLAGS_1.xml
@@ -1,11 +1,11 @@
<?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>
-[?1034hscons: Reading SConscript files ...
+scons: Reading SConscript files ...
scons: done reading SConscript files.
scons: Building targets ...
... [build output] ...
scons: done building targets.
% <userinput>export SCONSFLAGS="-Q"</userinput>
% <userinput>scons</userinput>
-[?1034h ... [build output] ...
+ ... [build output] ...
</screen>
diff --git a/doc/generated/examples/commandline_SetOption_1.xml b/doc/generated/examples/commandline_SetOption_1.xml
index d1acfb3..bac0cf4 100644
--- a/doc/generated/examples/commandline_SetOption_1.xml
+++ b/doc/generated/examples/commandline_SetOption_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hrunning with -j 2
+running with -j 2
scons: `.' is up to date.
</screen>
diff --git a/doc/generated/examples/commandline_SetOption_2.xml b/doc/generated/examples/commandline_SetOption_2.xml
index 89736b3..b00e073 100644
--- a/doc/generated/examples/commandline_SetOption_2.xml
+++ b/doc/generated/examples/commandline_SetOption_2.xml
@@ -1,6 +1,6 @@
<?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>export NUM_CPU="4"</userinput>
% <userinput>scons -Q</userinput>
-[?1034hrunning with -j 4
+running with -j 4
scons: `.' is up to date.
</screen>
diff --git a/doc/generated/examples/commandline_SetOption_3.xml b/doc/generated/examples/commandline_SetOption_3.xml
index 675feff..df42ff0 100644
--- a/doc/generated/examples/commandline_SetOption_3.xml
+++ b/doc/generated/examples/commandline_SetOption_3.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">% <userinput>scons -Q -j 7</userinput>
-[?1034hrunning with -j 7
+running with -j 7
scons: `.' is up to date.
% <userinput>export NUM_CPU="4"</userinput>
% <userinput>scons -Q -j 3</userinput>
-[?1034hrunning with -j 3
+running with -j 3
scons: `.' is up to date.
</screen>
diff --git a/doc/generated/examples/commandline_UnknownVariables_1.xml b/doc/generated/examples/commandline_UnknownVariables_1.xml
index 40e83d2..272a954 100644
--- a/doc/generated/examples/commandline_UnknownVariables_1.xml
+++ b/doc/generated/examples/commandline_UnknownVariables_1.xml
@@ -1,4 +1,4 @@
<?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 -Q NOT_KNOWN=foo</userinput>
-[?1034hUnknown variables: ['NOT_KNOWN']
+Unknown variables: ['NOT_KNOWN']
</screen>
diff --git a/doc/generated/examples/commandline_Variables1_1.xml b/doc/generated/examples/commandline_Variables1_1.xml
index 017c9c1..512ae65 100644
--- a/doc/generated/examples/commandline_Variables1_1.xml
+++ b/doc/generated/examples/commandline_Variables1_1.xml
@@ -1,6 +1,6 @@
<?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 -Q RELEASE=1</userinput>
-[?1034hcc -o bar.o -c -DRELEASE_BUILD=1 bar.c
+cc -o bar.o -c -DRELEASE_BUILD=1 bar.c
cc -o foo.o -c -DRELEASE_BUILD=1 foo.c
cc -o foo foo.o bar.o
</screen>
diff --git a/doc/generated/examples/commandline_Variables_Help_1.xml b/doc/generated/examples/commandline_Variables_Help_1.xml
index 3284799..db171eb 100644
--- a/doc/generated/examples/commandline_Variables_Help_1.xml
+++ b/doc/generated/examples/commandline_Variables_Help_1.xml
@@ -1,6 +1,6 @@
<?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 -Q -h</userinput>
-[?1034h
+
RELEASE: Set to 1 to build for release
default: 0
actual: 0
diff --git a/doc/generated/examples/commandline_Variables_custom_py_1_1.xml b/doc/generated/examples/commandline_Variables_custom_py_1_1.xml
index bdadb9a..4ef4d48 100644
--- a/doc/generated/examples/commandline_Variables_custom_py_1_1.xml
+++ b/doc/generated/examples/commandline_Variables_custom_py_1_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcc -o bar.o -c -DRELEASE_BUILD=1 bar.c
+cc -o bar.o -c -DRELEASE_BUILD=1 bar.c
cc -o foo.o -c -DRELEASE_BUILD=1 foo.c
cc -o foo foo.o bar.o
</screen>
diff --git a/doc/generated/examples/commandline_Variables_custom_py_2_1.xml b/doc/generated/examples/commandline_Variables_custom_py_2_1.xml
index 1980631..5961d0a 100644
--- a/doc/generated/examples/commandline_Variables_custom_py_2_1.xml
+++ b/doc/generated/examples/commandline_Variables_custom_py_2_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcc -o bar.o -c -DRELEASE_BUILD=0 bar.c
+cc -o bar.o -c -DRELEASE_BUILD=0 bar.c
cc -o foo.o -c -DRELEASE_BUILD=0 foo.c
cc -o foo foo.o bar.o
</screen>
diff --git a/doc/generated/examples/depends_AlwaysBuild_1.xml b/doc/generated/examples/depends_AlwaysBuild_1.xml
index 25e4ad2..86700fe 100644
--- a/doc/generated/examples/depends_AlwaysBuild_1.xml
+++ b/doc/generated/examples/depends_AlwaysBuild_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 -Q</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
cc -o hello hello.o
% <userinput>scons -Q</userinput>
-[?1034hcc -o hello hello.o
+cc -o hello hello.o
</screen>
diff --git a/doc/generated/examples/depends_AlwaysBuild_2.xml b/doc/generated/examples/depends_AlwaysBuild_2.xml
index a238d9d..d1bdd6d 100644
--- a/doc/generated/examples/depends_AlwaysBuild_2.xml
+++ b/doc/generated/examples/depends_AlwaysBuild_2.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 -Q</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
cc -o hello hello.o
% <userinput>scons -Q hello.o</userinput>
-[?1034hscons: `hello.o' is up to date.
+scons: `hello.o' is up to date.
</screen>
diff --git a/doc/generated/examples/depends_Requires_1.xml b/doc/generated/examples/depends_Requires_1.xml
index 6ec2942..04bfc35 100644
--- a/doc/generated/examples/depends_Requires_1.xml
+++ b/doc/generated/examples/depends_Requires_1.xml
@@ -1,20 +1,20 @@
<?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 -Q hello</userinput>
-[?1034hcc -o version.o -c version.c
+cc -o version.o -c version.c
cc -o hello.o -c hello.c
cc -o hello version.o hello.o
% <userinput>sleep 1</userinput>
% <userinput>scons -Q hello</userinput>
-[?1034hcc -o version.o -c version.c
+cc -o version.o -c version.c
scons: `hello' is up to date.
% <userinput>sleep 1</userinput>
% [CHANGE THE CONTENTS OF hello.c]
% <userinput>scons -Q hello</userinput>
-[?1034hcc -o version.o -c version.c
+cc -o version.o -c version.c
cc -o hello.o -c hello.c
cc -o hello version.o hello.o
% <userinput>sleep 1</userinput>
% <userinput>scons -Q hello</userinput>
-[?1034hcc -o version.o -c version.c
+cc -o version.o -c version.c
scons: `hello' is up to date.
</screen>
diff --git a/doc/generated/examples/depends_ex1_1.xml b/doc/generated/examples/depends_ex1_1.xml
index aa72efc..25355c9 100644
--- a/doc/generated/examples/depends_ex1_1.xml
+++ b/doc/generated/examples/depends_ex1_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 -Q</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
cc -o hello hello.o
% <userinput>scons -Q</userinput>
-[?1034hscons: `.' is up to date.
+scons: `.' is up to date.
</screen>
diff --git a/doc/generated/examples/depends_ex1_2.xml b/doc/generated/examples/depends_ex1_2.xml
index 456cfe8..09ecc73 100644
--- a/doc/generated/examples/depends_ex1_2.xml
+++ b/doc/generated/examples/depends_ex1_2.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 -Q hello</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
cc -o hello hello.o
% <userinput>scons -Q hello</userinput>
-[?1034hscons: `hello' is up to date.
+scons: `hello' is up to date.
</screen>
diff --git a/doc/generated/examples/depends_ex1_3.xml b/doc/generated/examples/depends_ex1_3.xml
index 801b3af..20062df 100644
--- a/doc/generated/examples/depends_ex1_3.xml
+++ b/doc/generated/examples/depends_ex1_3.xml
@@ -1,8 +1,8 @@
<?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 -Q hello</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
cc -o hello hello.o
% <userinput>touch hello.c</userinput>
% <userinput>scons -Q hello</userinput>
-[?1034hscons: `hello' is up to date.
+scons: `hello' is up to date.
</screen>
diff --git a/doc/generated/examples/depends_ex1_4.xml b/doc/generated/examples/depends_ex1_4.xml
index 7a87b29..31aa5bd 100644
--- a/doc/generated/examples/depends_ex1_4.xml
+++ b/doc/generated/examples/depends_ex1_4.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">% <userinput>scons -Q hello</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
cc -o hello hello.o
% [CHANGE THE CONTENTS OF hello.c]
% <userinput>scons -Q hello</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
cc -o hello hello.o
</screen>
diff --git a/doc/generated/examples/depends_ex1_5.xml b/doc/generated/examples/depends_ex1_5.xml
index f5517e8..776bda2 100644
--- a/doc/generated/examples/depends_ex1_5.xml
+++ b/doc/generated/examples/depends_ex1_5.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">% <userinput>scons -Q hello</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
cc -o hello hello.o
% [CHANGE A COMMENT IN hello.c]
% <userinput>scons -Q hello</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
scons: `hello' is up to date.
</screen>
diff --git a/doc/generated/examples/depends_ex1_6.xml b/doc/generated/examples/depends_ex1_6.xml
index 4993702..7493627 100644
--- a/doc/generated/examples/depends_ex1_6.xml
+++ b/doc/generated/examples/depends_ex1_6.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 -Q --implicit-cache hello</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
cc -o hello hello.o
% <userinput>scons -Q hello</userinput>
-[?1034hscons: `hello' is up to date.
+scons: `hello' is up to date.
</screen>
diff --git a/doc/generated/examples/depends_ex1_7.xml b/doc/generated/examples/depends_ex1_7.xml
index b806781..22b56d3 100644
--- a/doc/generated/examples/depends_ex1_7.xml
+++ b/doc/generated/examples/depends_ex1_7.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 -Q --implicit-deps-changed hello</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
cc -o hello hello.o
% <userinput>scons -Q hello</userinput>
-[?1034hscons: `hello' is up to date.
+scons: `hello' is up to date.
</screen>
diff --git a/doc/generated/examples/depends_ex1_8.xml b/doc/generated/examples/depends_ex1_8.xml
index a071add..d60db97 100644
--- a/doc/generated/examples/depends_ex1_8.xml
+++ b/doc/generated/examples/depends_ex1_8.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 -Q --implicit-deps-unchanged hello</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
cc -o hello hello.o
% <userinput>scons -Q hello</userinput>
-[?1034hscons: `hello' is up to date.
+scons: `hello' is up to date.
</screen>
diff --git a/doc/generated/examples/depends_ex5_1.xml b/doc/generated/examples/depends_ex5_1.xml
index 6535020..e81cb0c 100644
--- a/doc/generated/examples/depends_ex5_1.xml
+++ b/doc/generated/examples/depends_ex5_1.xml
@@ -1,5 +1,5 @@
<?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 -Q hello</userinput>
-[?1034hcc -o hello.o -c -Iinclude -I/home/project/inc hello.c
+cc -o hello.o -c -Iinclude -I/home/project/inc hello.c
cc -o hello hello.o
</screen>
diff --git a/doc/generated/examples/depends_ex5_2.xml b/doc/generated/examples/depends_ex5_2.xml
index fc0239b..ea78590 100644
--- a/doc/generated/examples/depends_ex5_2.xml
+++ b/doc/generated/examples/depends_ex5_2.xml
@@ -1,6 +1,6 @@
<?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 -Q hello.exe</userinput>
-[?1034hcl /Fohello.obj /c hello.c /nologo /Iinclude /I\home\project\inc
+cl /Fohello.obj /c hello.c /nologo /Iinclude /I\home\project\inc
link /nologo /OUT:hello.exe hello.obj
embedManifestExeCheck(target, source, env)
</screen>
diff --git a/doc/generated/examples/depends_ignore_explicit_1.xml b/doc/generated/examples/depends_ignore_explicit_1.xml
index 15c5a69..a45a852 100644
--- a/doc/generated/examples/depends_ignore_explicit_1.xml
+++ b/doc/generated/examples/depends_ignore_explicit_1.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">% <userinput>scons -Q</userinput>
-[?1034hscons: `.' is up to date.
+scons: `.' is up to date.
% <userinput>scons -Q hello</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
cc -o hello hello.o
% <userinput>scons -Q hello</userinput>
-[?1034hscons: `hello' is up to date.
+scons: `hello' is up to date.
</screen>
diff --git a/doc/generated/examples/depends_include_1.xml b/doc/generated/examples/depends_include_1.xml
index e34f5ec..e22bd03 100644
--- a/doc/generated/examples/depends_include_1.xml
+++ b/doc/generated/examples/depends_include_1.xml
@@ -1,11 +1,11 @@
<?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 -Q hello</userinput>
-[?1034hcc -o hello.o -c -I. hello.c
+cc -o hello.o -c -I. hello.c
cc -o hello hello.o
% <userinput>scons -Q hello</userinput>
-[?1034hscons: `hello' is up to date.
+scons: `hello' is up to date.
% [CHANGE THE CONTENTS OF hello.h]
% <userinput>scons -Q hello</userinput>
-[?1034hcc -o hello.o -c -I. hello.c
+cc -o hello.o -c -I. hello.c
cc -o hello hello.o
</screen>
diff --git a/doc/generated/examples/depends_macroinc_1.xml b/doc/generated/examples/depends_macroinc_1.xml
index ae40fe6..95d4e0b 100644
--- a/doc/generated/examples/depends_macroinc_1.xml
+++ b/doc/generated/examples/depends_macroinc_1.xml
@@ -1,8 +1,8 @@
<?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 -Q</userinput>
-[?1034hcc -o hello.o -c -I. hello.c
+cc -o hello.o -c -I. hello.c
cc -o hello hello.o
% [CHANGE CONTENTS OF foo.h]
% <userinput>scons -Q</userinput>
-[?1034hscons: `.' is up to date.
+scons: `.' is up to date.
</screen>
diff --git a/doc/generated/examples/depends_match_1.xml b/doc/generated/examples/depends_match_1.xml
index 9c92424..7dc3831 100644
--- a/doc/generated/examples/depends_match_1.xml
+++ b/doc/generated/examples/depends_match_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 -Q hello.o</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
% <userinput>touch -t 198901010000 hello.c</userinput>
% <userinput>scons -Q hello.o</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
</screen>
diff --git a/doc/generated/examples/depends_mixing_1.xml b/doc/generated/examples/depends_mixing_1.xml
index 4990049..258dc90 100644
--- a/doc/generated/examples/depends_mixing_1.xml
+++ b/doc/generated/examples/depends_mixing_1.xml
@@ -1,11 +1,11 @@
<?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 -Q</userinput>
-[?1034hcc -o program1.o -c -I. program1.c
+cc -o program1.o -c -I. program1.c
cc -o prog-MD5 program1.o
cc -o program2.o -c -I. program2.c
cc -o prog-timestamp program2.o
% <userinput>touch inc.h</userinput>
% <userinput>scons -Q</userinput>
-[?1034hcc -o program2.o -c -I. program2.c
+cc -o program2.o -c -I. program2.c
cc -o prog-timestamp program2.o
</screen>
diff --git a/doc/generated/examples/depends_newer_1.xml b/doc/generated/examples/depends_newer_1.xml
index f50d149..28cb427 100644
--- a/doc/generated/examples/depends_newer_1.xml
+++ b/doc/generated/examples/depends_newer_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 -Q hello.o</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
% <userinput>touch hello.c</userinput>
% <userinput>scons -Q hello.o</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
</screen>
diff --git a/doc/generated/examples/depends_no-Requires_1.xml b/doc/generated/examples/depends_no-Requires_1.xml
index 31be030..8e2729f 100644
--- a/doc/generated/examples/depends_no-Requires_1.xml
+++ b/doc/generated/examples/depends_no-Requires_1.xml
@@ -1,14 +1,14 @@
<?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 -Q hello</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
cc -o version.o -c version.c
cc -o hello hello.o version.o
% <userinput>sleep 1</userinput>
% <userinput>scons -Q hello</userinput>
-[?1034hcc -o version.o -c version.c
+cc -o version.o -c version.c
cc -o hello hello.o version.o
% <userinput>sleep 1</userinput>
% <userinput>scons -Q hello</userinput>
-[?1034hcc -o version.o -c version.c
+cc -o version.o -c version.c
cc -o hello hello.o version.o
</screen>
diff --git a/doc/generated/examples/depends_parsedep_1.xml b/doc/generated/examples/depends_parsedep_1.xml
index 0f1004a..910930b1 100644
--- a/doc/generated/examples/depends_parsedep_1.xml
+++ b/doc/generated/examples/depends_parsedep_1.xml
@@ -1,8 +1,8 @@
<?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 -Q</userinput>
-[?1034hcc -o hello.o -c -MD -MF hello.d -I. hello.c
+cc -o hello.o -c -MD -MF hello.d -I. hello.c
cc -o hello hello.o
% [CHANGE CONTENTS OF foo.h]
% <userinput>scons -Q</userinput>
-[?1034hcc -o hello.o -c -MD -MF hello.d -I. hello.c
+cc -o hello.o -c -MD -MF hello.d -I. hello.c
</screen>
diff --git a/doc/generated/examples/environments_Append-nonexistent_1.xml b/doc/generated/examples/environments_Append-nonexistent_1.xml
index 2a0aad1..bb15965 100644
--- a/doc/generated/examples/environments_Append-nonexistent_1.xml
+++ b/doc/generated/examples/environments_Append-nonexistent_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hNEW_VARIABLE = added
+NEW_VARIABLE = added
scons: `.' is up to date.
</screen>
diff --git a/doc/generated/examples/environments_Prepend-nonexistent_1.xml b/doc/generated/examples/environments_Prepend-nonexistent_1.xml
index 2a0aad1..bb15965 100644
--- a/doc/generated/examples/environments_Prepend-nonexistent_1.xml
+++ b/doc/generated/examples/environments_Prepend-nonexistent_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hNEW_VARIABLE = added
+NEW_VARIABLE = added
scons: `.' is up to date.
</screen>
diff --git a/doc/generated/examples/environments_Replace-nonexistent_1.xml b/doc/generated/examples/environments_Replace-nonexistent_1.xml
index 08aa35f..c4480b5 100644
--- a/doc/generated/examples/environments_Replace-nonexistent_1.xml
+++ b/doc/generated/examples/environments_Replace-nonexistent_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hNEW_VARIABLE = xyzzy
+NEW_VARIABLE = xyzzy
scons: `.' is up to date.
</screen>
diff --git a/doc/generated/examples/environments_Replace1_1.xml b/doc/generated/examples/environments_Replace1_1.xml
index 04fa66f..54f4976 100644
--- a/doc/generated/examples/environments_Replace1_1.xml
+++ b/doc/generated/examples/environments_Replace1_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hcc -o foo.o -c -DDEFINE2 foo.c
+cc -o foo.o -c -DDEFINE2 foo.c
cc -o foo foo.o
</screen>
diff --git a/doc/generated/examples/environments_Replace2_1.xml b/doc/generated/examples/environments_Replace2_1.xml
index 5fdb033..9ad257b 100644
--- a/doc/generated/examples/environments_Replace2_1.xml
+++ b/doc/generated/examples/environments_Replace2_1.xml
@@ -1,6 +1,6 @@
<?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>
-[?1034hscons: Reading SConscript files ...
+scons: Reading SConscript files ...
CCFLAGS = -DDEFINE1
CCFLAGS = -DDEFINE2
scons: done reading SConscript files.
diff --git a/doc/generated/examples/environments_ex1_1.xml b/doc/generated/examples/environments_ex1_1.xml
index d854515..84d22b8 100644
--- a/doc/generated/examples/environments_ex1_1.xml
+++ b/doc/generated/examples/environments_ex1_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hgcc -o foo.o -c -O2 foo.c
+gcc -o foo.o -c -O2 foo.c
gcc -o foo foo.o
</screen>
diff --git a/doc/generated/examples/environments_ex2_1.xml b/doc/generated/examples/environments_ex2_1.xml
index 30bd609..eb86c9e 100644
--- a/doc/generated/examples/environments_ex2_1.xml
+++ b/doc/generated/examples/environments_ex2_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcc -o bar.o -c -g bar.c
+cc -o bar.o -c -g bar.c
cc -o bar bar.o
cc -o foo.o -c -O2 foo.c
cc -o foo foo.o
diff --git a/doc/generated/examples/environments_ex3_1.xml b/doc/generated/examples/environments_ex3_1.xml
index 8d2f735..4de56be 100644
--- a/doc/generated/examples/environments_ex3_1.xml
+++ b/doc/generated/examples/environments_ex3_1.xml
@@ -17,7 +17,6 @@ UnicodeDecodeError: 'utf8' codec can't decode byte 0xc2 in position 249: invalid
_node_errors(self, env, tlist, slist)
File "bootstrap/src/engine/SCons/Builder.py", line 302:
msg = "Two environments with different actions were specified for the same target: %s\n(action 1: %s)\n(action 2: %s)" % (t,t_contents.decode('utf-8'),contents.decode('utf-8'))
- File "/opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/encodings/utf_8.py", line 16:
+ File "/usr/lib/python2.7/encodings/utf_8.py", line 16:
return codecs.utf_8_decode(input, errors, True)
-[?1034h
</screen>
diff --git a/doc/generated/examples/environments_ex4_1.xml b/doc/generated/examples/environments_ex4_1.xml
index 2e92c78..286f46f 100644
--- a/doc/generated/examples/environments_ex4_1.xml
+++ b/doc/generated/examples/environments_ex4_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcc -o foo-dbg.o -c -g foo.c
+cc -o foo-dbg.o -c -g foo.c
cc -o foo-dbg foo-dbg.o
cc -o foo-opt.o -c -O2 foo.c
cc -o foo-opt foo-opt.o
diff --git a/doc/generated/examples/environments_ex5_1.xml b/doc/generated/examples/environments_ex5_1.xml
index c12d3ab..d6f0094 100644
--- a/doc/generated/examples/environments_ex5_1.xml
+++ b/doc/generated/examples/environments_ex5_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hgcc -o foo.o -c foo.c
+gcc -o foo.o -c foo.c
gcc -o foo foo.o
gcc -o foo-dbg.o -c -g foo.c
gcc -o foo-dbg foo-dbg.o
diff --git a/doc/generated/examples/environments_ex6_1.xml b/doc/generated/examples/environments_ex6_1.xml
index 47b99c2..af8667f 100644
--- a/doc/generated/examples/environments_ex6_1.xml
+++ b/doc/generated/examples/environments_ex6_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hCC is: cc
+CC is: cc
scons: `.' is up to date.
</screen>
diff --git a/doc/generated/examples/environments_ex6b_1.xml b/doc/generated/examples/environments_ex6b_1.xml
index 6234233..47a499a 100644
--- a/doc/generated/examples/environments_ex6b_1.xml
+++ b/doc/generated/examples/environments_ex6b_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hkey = OBJSUFFIX, value = .o
+key = OBJSUFFIX, value = .o
key = LIBSUFFIX, value = .a
key = PROGSUFFIX, value =
scons: `.' is up to date.
diff --git a/doc/generated/examples/environments_ex6b_2.xml b/doc/generated/examples/environments_ex6b_2.xml
index 33f5e57..73a6d19 100644
--- a/doc/generated/examples/environments_ex6b_2.xml
+++ b/doc/generated/examples/environments_ex6b_2.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hkey = OBJSUFFIX, value = .obj
+key = OBJSUFFIX, value = .obj
key = LIBSUFFIX, value = .lib
key = PROGSUFFIX, value = .exe
scons: `.' is up to date.
diff --git a/doc/generated/examples/environments_ex8_1.xml b/doc/generated/examples/environments_ex8_1.xml
index adfeb26..68ebac4 100644
--- a/doc/generated/examples/environments_ex8_1.xml
+++ b/doc/generated/examples/environments_ex8_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hcc -o foo.o -c -DMY_VALUE -DLAST foo.c
+cc -o foo.o -c -DMY_VALUE -DLAST foo.c
cc -o foo foo.o
</screen>
diff --git a/doc/generated/examples/environments_ex9_1.xml b/doc/generated/examples/environments_ex9_1.xml
index 502caa8..3e31c3f 100644
--- a/doc/generated/examples/environments_ex9_1.xml
+++ b/doc/generated/examples/environments_ex9_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hcc -o foo.o -c -DFIRST -DMY_VALUE foo.c
+cc -o foo.o -c -DFIRST -DMY_VALUE foo.c
cc -o foo foo.o
</screen>
diff --git a/doc/generated/examples/environments_missing1_1.xml b/doc/generated/examples/environments_missing1_1.xml
index 8795e5f..edf136f 100644
--- a/doc/generated/examples/environments_missing1_1.xml
+++ b/doc/generated/examples/environments_missing1_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hvalue is: -&gt;&lt;-
+value is: -&gt;&lt;-
scons: `.' is up to date.
</screen>
diff --git a/doc/generated/examples/environments_missing2_1.xml b/doc/generated/examples/environments_missing2_1.xml
index 9a83824..ffb308c 100644
--- a/doc/generated/examples/environments_missing2_1.xml
+++ b/doc/generated/examples/environments_missing2_1.xml
@@ -3,5 +3,4 @@
scons: *** NameError `MISSING' trying to evaluate `$MISSING'
File "/home/my/project/SConstruct", line 3, in &lt;module&gt;
-[?1034h
</screen>
diff --git a/doc/generated/examples/environments_missing3_1.xml b/doc/generated/examples/environments_missing3_1.xml
index 8795e5f..edf136f 100644
--- a/doc/generated/examples/environments_missing3_1.xml
+++ b/doc/generated/examples/environments_missing3_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hvalue is: -&gt;&lt;-
+value is: -&gt;&lt;-
scons: `.' is up to date.
</screen>
diff --git a/doc/generated/examples/factories_Chmod_1.xml b/doc/generated/examples/factories_Chmod_1.xml
index 1663b30..a324ed4 100644
--- a/doc/generated/examples/factories_Chmod_1.xml
+++ b/doc/generated/examples/factories_Chmod_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hCopy("file.out", "file.in")
+Copy("file.out", "file.in")
Chmod("file.out", 0755)
</screen>
diff --git a/doc/generated/examples/factories_Copy1_1.xml b/doc/generated/examples/factories_Copy1_1.xml
index 01ced08..852412f 100644
--- a/doc/generated/examples/factories_Copy1_1.xml
+++ b/doc/generated/examples/factories_Copy1_1.xml
@@ -1,4 +1,4 @@
<?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 -Q</userinput>
-[?1034hCopy("file.out", "file.in")
+Copy("file.out", "file.in")
</screen>
diff --git a/doc/generated/examples/factories_Copy2_1.xml b/doc/generated/examples/factories_Copy2_1.xml
index 01ced08..852412f 100644
--- a/doc/generated/examples/factories_Copy2_1.xml
+++ b/doc/generated/examples/factories_Copy2_1.xml
@@ -1,4 +1,4 @@
<?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 -Q</userinput>
-[?1034hCopy("file.out", "file.in")
+Copy("file.out", "file.in")
</screen>
diff --git a/doc/generated/examples/factories_Copy3_1.xml b/doc/generated/examples/factories_Copy3_1.xml
index 6876b29..bcb41ff 100644
--- a/doc/generated/examples/factories_Copy3_1.xml
+++ b/doc/generated/examples/factories_Copy3_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hCopy("tempfile", "file.in")
+Copy("tempfile", "file.in")
modify tempfile
Copy("file.out", "tempfile")
</screen>
diff --git a/doc/generated/examples/factories_Delete1_1.xml b/doc/generated/examples/factories_Delete1_1.xml
index f2bcdc4..e9a287e 100644
--- a/doc/generated/examples/factories_Delete1_1.xml
+++ b/doc/generated/examples/factories_Delete1_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hDelete("tempfile")
+Delete("tempfile")
Copy("tempfile", "file.in")
modify tempfile
Copy("file.out", "tempfile")
diff --git a/doc/generated/examples/factories_Delete2_1.xml b/doc/generated/examples/factories_Delete2_1.xml
index 069fa1c..2be3c3a 100644
--- a/doc/generated/examples/factories_Delete2_1.xml
+++ b/doc/generated/examples/factories_Delete2_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hDelete("file.out")
+Delete("file.out")
Copy("file.out", "file.in")
</screen>
diff --git a/doc/generated/examples/factories_Execute_1.xml b/doc/generated/examples/factories_Execute_1.xml
index 82a0c5a..a7ae0c7 100644
--- a/doc/generated/examples/factories_Execute_1.xml
+++ b/doc/generated/examples/factories_Execute_1.xml
@@ -1,6 +1,6 @@
<?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>
-[?1034hscons: Reading SConscript files ...
+scons: Reading SConscript files ...
Mkdir("/tmp/my_temp_directory")
scons: done reading SConscript files.
scons: Building targets ...
diff --git a/doc/generated/examples/factories_Mkdir_1.xml b/doc/generated/examples/factories_Mkdir_1.xml
index 2c4962e..ea3d79d 100644
--- a/doc/generated/examples/factories_Mkdir_1.xml
+++ b/doc/generated/examples/factories_Mkdir_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hDelete("tempdir")
+Delete("tempdir")
Mkdir("tempdir")
Copy("tempdir/file.in", "file.in")
process tempdir
diff --git a/doc/generated/examples/factories_Move_1.xml b/doc/generated/examples/factories_Move_1.xml
index b797692..a5e4ccd 100644
--- a/doc/generated/examples/factories_Move_1.xml
+++ b/doc/generated/examples/factories_Move_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hCopy("tempfile", "file.in")
+Copy("tempfile", "file.in")
modify tempfile
Move("file.out", "tempfile")
</screen>
diff --git a/doc/generated/examples/factories_Touch_1.xml b/doc/generated/examples/factories_Touch_1.xml
index 1ae08b6..7417fa4 100644
--- a/doc/generated/examples/factories_Touch_1.xml
+++ b/doc/generated/examples/factories_Touch_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hCopy("file.out", "file.in")
+Copy("file.out", "file.in")
Touch("file.out")
</screen>
diff --git a/doc/generated/examples/fileremoval_clean-ex1_1.xml b/doc/generated/examples/fileremoval_clean-ex1_1.xml
index 07ee186..c76a7e5 100644
--- a/doc/generated/examples/fileremoval_clean-ex1_1.xml
+++ b/doc/generated/examples/fileremoval_clean-ex1_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 -Q</userinput>
-[?1034hbuild -o foo.out foo.in
+build -o foo.out foo.in
% <userinput>scons -Q -c</userinput>
-[?1034hRemoved foo.out
+Removed foo.out
Removed foo.log
</screen>
diff --git a/doc/generated/examples/fileremoval_noclean-ex1_1.xml b/doc/generated/examples/fileremoval_noclean-ex1_1.xml
index 9726156..45bd878 100644
--- a/doc/generated/examples/fileremoval_noclean-ex1_1.xml
+++ b/doc/generated/examples/fileremoval_noclean-ex1_1.xml
@@ -1,11 +1,11 @@
<?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 -Q</userinput>
-[?1034hcc -o f1.o -c f1.c
+cc -o f1.o -c f1.c
cc -o f2.o -c f2.c
cc -o f3.o -c f3.c
ar rc libfoo.a f1.o f2.o f3.o
% <userinput>scons -c</userinput>
-[?1034hscons: Reading SConscript files ...
+scons: Reading SConscript files ...
scons: done reading SConscript files.
scons: Cleaning targets ...
Removed f1.o
diff --git a/doc/generated/examples/fileremoval_precious-ex1_1.xml b/doc/generated/examples/fileremoval_precious-ex1_1.xml
index 86f1ea7..36e5a25 100644
--- a/doc/generated/examples/fileremoval_precious-ex1_1.xml
+++ b/doc/generated/examples/fileremoval_precious-ex1_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcc -o f1.o -c f1.c
+cc -o f1.o -c f1.c
cc -o f2.o -c f2.c
cc -o f3.o -c f3.c
ar rc libfoo.a f1.o f2.o f3.o
diff --git a/doc/generated/examples/hierarchy_Return_1.xml b/doc/generated/examples/hierarchy_Return_1.xml
index e869a2e..e5ab7f7 100644
--- a/doc/generated/examples/hierarchy_Return_1.xml
+++ b/doc/generated/examples/hierarchy_Return_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcc -o bar/bar.o -c bar/bar.c
+cc -o bar/bar.o -c bar/bar.c
cc -o foo/foo.o -c foo/foo.c
ar rc libprog.a foo/foo.o bar/bar.o
ranlib libprog.a
diff --git a/doc/generated/examples/hierarchy_ex1_1.xml b/doc/generated/examples/hierarchy_ex1_1.xml
index ad890e0..bb5cc7b 100644
--- a/doc/generated/examples/hierarchy_ex1_1.xml
+++ b/doc/generated/examples/hierarchy_ex1_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcc -o prog1/foo1.o -c prog1/foo1.c
+cc -o prog1/foo1.o -c prog1/foo1.c
cc -o prog1/foo2.o -c prog1/foo2.c
cc -o prog1/main.o -c prog1/main.c
cc -o prog1/prog1 prog1/main.o prog1/foo1.o prog1/foo2.o
diff --git a/doc/generated/examples/hierarchy_ex2_1.xml b/doc/generated/examples/hierarchy_ex2_1.xml
index 5581784..800a921 100644
--- a/doc/generated/examples/hierarchy_ex2_1.xml
+++ b/doc/generated/examples/hierarchy_ex2_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcc -o lib/foo1.o -c lib/foo1.c
+cc -o lib/foo1.o -c lib/foo1.c
cc -o src/prog/foo2.o -c src/prog/foo2.c
cc -o src/prog/main.o -c src/prog/main.c
cc -o src/prog/prog src/prog/main.o lib/foo1.o src/prog/foo2.o
diff --git a/doc/generated/examples/hierarchy_ex3_1.xml b/doc/generated/examples/hierarchy_ex3_1.xml
index 7d408c2..473c9f4 100644
--- a/doc/generated/examples/hierarchy_ex3_1.xml
+++ b/doc/generated/examples/hierarchy_ex3_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcc -o src/prog/foo2.o -c src/prog/foo2.c
+cc -o src/prog/foo2.o -c src/prog/foo2.c
cc -o src/prog/main.o -c src/prog/main.c
cc -o /usr/joe/lib/foo1.o -c /usr/joe/lib/foo1.c
cc -o src/prog/prog src/prog/main.o /usr/joe/lib/foo1.o src/prog/foo2.o
diff --git a/doc/generated/examples/install_ex1_1.xml b/doc/generated/examples/install_ex1_1.xml
index 7df8618..776f7e8 100644
--- a/doc/generated/examples/install_ex1_1.xml
+++ b/doc/generated/examples/install_ex1_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 -Q</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
cc -o hello hello.o
% <userinput>scons -Q /usr/bin</userinput>
-[?1034hInstall file: "hello" as "/usr/bin/hello"
+Install file: "hello" as "/usr/bin/hello"
</screen>
diff --git a/doc/generated/examples/install_ex2_1.xml b/doc/generated/examples/install_ex2_1.xml
index f05e500..98de9c4 100644
--- a/doc/generated/examples/install_ex2_1.xml
+++ b/doc/generated/examples/install_ex2_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 -Q</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
cc -o hello hello.o
% <userinput>scons -Q install</userinput>
-[?1034hInstall file: "hello" as "/usr/bin/hello"
+Install file: "hello" as "/usr/bin/hello"
</screen>
diff --git a/doc/generated/examples/install_ex3_1.xml b/doc/generated/examples/install_ex3_1.xml
index 10299fd..e306111 100644
--- a/doc/generated/examples/install_ex3_1.xml
+++ b/doc/generated/examples/install_ex3_1.xml
@@ -1,6 +1,6 @@
<?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 -Q install</userinput>
-[?1034hcc -o goodbye.o -c goodbye.c
+cc -o goodbye.o -c goodbye.c
cc -o goodbye goodbye.o
Install file: "goodbye" as "/usr/bin/goodbye"
cc -o hello.o -c hello.c
diff --git a/doc/generated/examples/install_ex4_1.xml b/doc/generated/examples/install_ex4_1.xml
index af9ed3a..36cd90c 100644
--- a/doc/generated/examples/install_ex4_1.xml
+++ b/doc/generated/examples/install_ex4_1.xml
@@ -1,6 +1,6 @@
<?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 -Q install</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
cc -o hello hello.o
Install file: "hello" as "/usr/bin/hello-new"
</screen>
diff --git a/doc/generated/examples/install_ex5_1.xml b/doc/generated/examples/install_ex5_1.xml
index 3ba111d..89f7c56 100644
--- a/doc/generated/examples/install_ex5_1.xml
+++ b/doc/generated/examples/install_ex5_1.xml
@@ -1,6 +1,6 @@
<?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 -Q install</userinput>
-[?1034hcc -o goodbye.o -c goodbye.c
+cc -o goodbye.o -c goodbye.c
cc -o goodbye goodbye.o
Install file: "goodbye" as "/usr/bin/goodbye-new"
cc -o hello.o -c hello.c
diff --git a/doc/generated/examples/java_JAVACLASSDIR_1.xml b/doc/generated/examples/java_JAVACLASSDIR_1.xml
index 0ff651d..5e0709a 100644
--- a/doc/generated/examples/java_JAVACLASSDIR_1.xml
+++ b/doc/generated/examples/java_JAVACLASSDIR_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hjavac -d classes -sourcepath src/pkg/sub src/pkg/sub/Example1.java src/pkg/sub/Example2.java src/pkg/sub/Example3.java
+javac -d classes -sourcepath src/pkg/sub src/pkg/sub/Example1.java src/pkg/sub/Example2.java src/pkg/sub/Example3.java
javah -d native -classpath classes pkg.sub.Example1 pkg.sub.Example2 pkg.sub.Example3
</screen>
diff --git a/doc/generated/examples/java_RMIC_1.xml b/doc/generated/examples/java_RMIC_1.xml
index b16f894..4db895e 100644
--- a/doc/generated/examples/java_RMIC_1.xml
+++ b/doc/generated/examples/java_RMIC_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hjavac -d classes -sourcepath src/pkg/sub src/pkg/sub/Example1.java src/pkg/sub/Example2.java
+javac -d classes -sourcepath src/pkg/sub src/pkg/sub/Example1.java src/pkg/sub/Example2.java
rmic -d outdir -classpath classes pkg.sub.Example1 pkg.sub.Example2
</screen>
diff --git a/doc/generated/examples/java_jar1_1.xml b/doc/generated/examples/java_jar1_1.xml
index d91429d..de93227 100644
--- a/doc/generated/examples/java_jar1_1.xml
+++ b/doc/generated/examples/java_jar1_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hjavac -d classes -sourcepath src src/Example1.java src/Example2.java src/Example3.java
+javac -d classes -sourcepath src src/Example1.java src/Example2.java src/Example3.java
jar cf test.jar classes
</screen>
diff --git a/doc/generated/examples/java_jar2_1.xml b/doc/generated/examples/java_jar2_1.xml
index a515df8..9e942e2 100644
--- a/doc/generated/examples/java_jar2_1.xml
+++ b/doc/generated/examples/java_jar2_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hjavac -d classes -sourcepath prog1 prog1/Example1.java prog1/Example2.java
+javac -d classes -sourcepath prog1 prog1/Example1.java prog1/Example2.java
javac -d classes -sourcepath prog2 prog2/Example3.java prog2/Example4.java
jar cf prog1.jar -C classes Example1.class -C classes Example2.class
jar cf prog2.jar -C classes Example3.class -C classes Example4.class
diff --git a/doc/generated/examples/java_java-classes_1.xml b/doc/generated/examples/java_java-classes_1.xml
index 67e2c3f..6f02f5f 100644
--- a/doc/generated/examples/java_java-classes_1.xml
+++ b/doc/generated/examples/java_java-classes_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hjavac -d classes -sourcepath src src/Example1.java src/Example2.java src/Example3.java
+javac -d classes -sourcepath src src/Example1.java src/Example2.java src/Example3.java
% <userinput>scons -Q classes</userinput>
-[?1034hscons: `classes' is up to date.
+scons: `classes' is up to date.
</screen>
diff --git a/doc/generated/examples/java_java-classes_2.xml b/doc/generated/examples/java_java-classes_2.xml
index f68082e..31f6028 100644
--- a/doc/generated/examples/java_java-classes_2.xml
+++ b/doc/generated/examples/java_java-classes_2.xml
@@ -1,8 +1,8 @@
<?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 -Q</userinput>
-[?1034hjavac -d classes -sourcepath src src/Example1.java src/Example2.java src/Example3.java
+javac -d classes -sourcepath src src/Example1.java src/Example2.java src/Example3.java
% <userinput>scons -Q -c classes</userinput>
-[?1034hRemoved classes/Example1.class
+Removed classes/Example1.class
Removed classes/AdditionalClass1.class
Removed classes/Example2$Inner2.class
Removed classes/Example2.class
diff --git a/doc/generated/examples/java_java_1.xml b/doc/generated/examples/java_java_1.xml
index f740867..551a5d4 100644
--- a/doc/generated/examples/java_java_1.xml
+++ b/doc/generated/examples/java_java_1.xml
@@ -1,4 +1,4 @@
<?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 -Q</userinput>
-[?1034hjavac -d classes -sourcepath src src/Example1.java src/Example2.java src/Example3.java
+javac -d classes -sourcepath src src/Example1.java src/Example2.java src/Example3.java
</screen>
diff --git a/doc/generated/examples/java_javah_1.xml b/doc/generated/examples/java_javah_1.xml
index 0ff651d..5e0709a 100644
--- a/doc/generated/examples/java_javah_1.xml
+++ b/doc/generated/examples/java_javah_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hjavac -d classes -sourcepath src/pkg/sub src/pkg/sub/Example1.java src/pkg/sub/Example2.java src/pkg/sub/Example3.java
+javac -d classes -sourcepath src/pkg/sub src/pkg/sub/Example1.java src/pkg/sub/Example2.java src/pkg/sub/Example3.java
javah -d native -classpath classes pkg.sub.Example1 pkg.sub.Example2 pkg.sub.Example3
</screen>
diff --git a/doc/generated/examples/java_javah_file_1.xml b/doc/generated/examples/java_javah_file_1.xml
index ed65b48..163a53d 100644
--- a/doc/generated/examples/java_javah_file_1.xml
+++ b/doc/generated/examples/java_javah_file_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hjavac -d classes -sourcepath src/pkg/sub src/pkg/sub/Example1.java src/pkg/sub/Example2.java src/pkg/sub/Example3.java
+javac -d classes -sourcepath src/pkg/sub src/pkg/sub/Example1.java src/pkg/sub/Example2.java src/pkg/sub/Example3.java
javah -o native.h -classpath classes pkg.sub.Example1 pkg.sub.Example2 pkg.sub.Example3
</screen>
diff --git a/doc/generated/examples/lesssimple_ex2_1.xml b/doc/generated/examples/lesssimple_ex2_1.xml
index b212b8b..6093f0c 100644
--- a/doc/generated/examples/lesssimple_ex2_1.xml
+++ b/doc/generated/examples/lesssimple_ex2_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcc -o file1.o -c file1.c
+cc -o file1.o -c file1.c
cc -o file2.o -c file2.c
cc -o prog.o -c prog.c
cc -o prog prog.o file1.o file2.o
diff --git a/doc/generated/examples/lesssimple_ex3_1.xml b/doc/generated/examples/lesssimple_ex3_1.xml
index 6df4fee..b3ac2f0 100644
--- a/doc/generated/examples/lesssimple_ex3_1.xml
+++ b/doc/generated/examples/lesssimple_ex3_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcc -o file1.o -c file1.c
+cc -o file1.o -c file1.c
cc -o file2.o -c file2.c
cc -o prog.o -c prog.c
cc -o program prog.o file1.o file2.o
diff --git a/doc/generated/examples/lesssimple_ex3_2.xml b/doc/generated/examples/lesssimple_ex3_2.xml
index 0ada0ec..835f048 100644
--- a/doc/generated/examples/lesssimple_ex3_2.xml
+++ b/doc/generated/examples/lesssimple_ex3_2.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcl /Fofile1.obj /c file1.c /nologo
+cl /Fofile1.obj /c file1.c /nologo
cl /Fofile2.obj /c file2.c /nologo
cl /Foprog.obj /c prog.c /nologo
link /nologo /OUT:program.exe prog.obj file1.obj file2.obj
diff --git a/doc/generated/examples/lesssimple_ex4_1.xml b/doc/generated/examples/lesssimple_ex4_1.xml
index 34e1210..87af41d 100644
--- a/doc/generated/examples/lesssimple_ex4_1.xml
+++ b/doc/generated/examples/lesssimple_ex4_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcc -o bar1.o -c bar1.c
+cc -o bar1.o -c bar1.c
cc -o bar2.o -c bar2.c
cc -o bar bar1.o bar2.o
cc -o foo.o -c foo.c
diff --git a/doc/generated/examples/lesssimple_ex5_1.xml b/doc/generated/examples/lesssimple_ex5_1.xml
index 0256456..0043e11 100644
--- a/doc/generated/examples/lesssimple_ex5_1.xml
+++ b/doc/generated/examples/lesssimple_ex5_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcc -o bar1.o -c bar1.c
+cc -o bar1.o -c bar1.c
cc -o bar2.o -c bar2.c
cc -o common1.o -c common1.c
cc -o common2.o -c common2.c
diff --git a/doc/generated/examples/lesssimple_target_1.xml b/doc/generated/examples/lesssimple_target_1.xml
index 45d3064..a958acb 100644
--- a/doc/generated/examples/lesssimple_target_1.xml
+++ b/doc/generated/examples/lesssimple_target_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
cc -o new_hello hello.o
</screen>
diff --git a/doc/generated/examples/lesssimple_target_2.xml b/doc/generated/examples/lesssimple_target_2.xml
index ec25cc2..ef7b241 100644
--- a/doc/generated/examples/lesssimple_target_2.xml
+++ b/doc/generated/examples/lesssimple_target_2.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcl /Fohello.obj /c hello.c /nologo
+cl /Fohello.obj /c hello.c /nologo
link /nologo /OUT:new_hello.exe hello.obj
embedManifestExeCheck(target, source, env)
</screen>
diff --git a/doc/generated/examples/libraries_SharedLibrary_1.xml b/doc/generated/examples/libraries_SharedLibrary_1.xml
index 1e316ec..2300891 100644
--- a/doc/generated/examples/libraries_SharedLibrary_1.xml
+++ b/doc/generated/examples/libraries_SharedLibrary_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcc -o f1.os -c f1.c
+cc -o f1.os -c f1.c
cc -o f2.os -c f2.c
cc -o f3.os -c f3.c
cc -o libfoo.so -shared f1.os f2.os f3.os
diff --git a/doc/generated/examples/libraries_SharedLibrary_2.xml b/doc/generated/examples/libraries_SharedLibrary_2.xml
index a0586d9..b6b484d 100644
--- a/doc/generated/examples/libraries_SharedLibrary_2.xml
+++ b/doc/generated/examples/libraries_SharedLibrary_2.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcl /Fof1.obj /c f1.c /nologo
+cl /Fof1.obj /c f1.c /nologo
cl /Fof2.obj /c f2.c /nologo
cl /Fof3.obj /c f3.c /nologo
link /nologo /dll /out:foo.dll /implib:foo.lib f1.obj f2.obj f3.obj
diff --git a/doc/generated/examples/libraries_ex1_1.xml b/doc/generated/examples/libraries_ex1_1.xml
index 7c1a49d..bfd69b4 100644
--- a/doc/generated/examples/libraries_ex1_1.xml
+++ b/doc/generated/examples/libraries_ex1_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcc -o f1.o -c f1.c
+cc -o f1.o -c f1.c
cc -o f2.o -c f2.c
cc -o f3.o -c f3.c
ar rc libfoo.a f1.o f2.o f3.o
diff --git a/doc/generated/examples/libraries_ex1_2.xml b/doc/generated/examples/libraries_ex1_2.xml
index 462dc04..912e7ad 100644
--- a/doc/generated/examples/libraries_ex1_2.xml
+++ b/doc/generated/examples/libraries_ex1_2.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcl /Fof1.obj /c f1.c /nologo
+cl /Fof1.obj /c f1.c /nologo
cl /Fof2.obj /c f2.c /nologo
cl /Fof3.obj /c f3.c /nologo
lib /nologo /OUT:foo.lib f1.obj f2.obj f3.obj
diff --git a/doc/generated/examples/libraries_ex2_1.xml b/doc/generated/examples/libraries_ex2_1.xml
index c9462d4..c43f7e9 100644
--- a/doc/generated/examples/libraries_ex2_1.xml
+++ b/doc/generated/examples/libraries_ex2_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcc -o f1.o -c f1.c
+cc -o f1.o -c f1.c
cc -o f2.o -c f2.c
cc -o f3.o -c f3.c
ar rc libfoo.a f1.o f2.o f3.o
diff --git a/doc/generated/examples/libraries_ex2_2.xml b/doc/generated/examples/libraries_ex2_2.xml
index 1dba3b8..84b4d75 100644
--- a/doc/generated/examples/libraries_ex2_2.xml
+++ b/doc/generated/examples/libraries_ex2_2.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcl /Fof1.obj /c f1.c /nologo
+cl /Fof1.obj /c f1.c /nologo
cl /Fof2.obj /c f2.c /nologo
cl /Fof3.obj /c f3.c /nologo
lib /nologo /OUT:foo.lib f1.obj f2.obj f3.obj
diff --git a/doc/generated/examples/libraries_ex3_1.xml b/doc/generated/examples/libraries_ex3_1.xml
index f685376..9dd6ca9 100644
--- a/doc/generated/examples/libraries_ex3_1.xml
+++ b/doc/generated/examples/libraries_ex3_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hcc -o prog.o -c prog.c
+cc -o prog.o -c prog.c
cc -o prog prog.o -L/usr/lib -L/usr/local/lib -lm
</screen>
diff --git a/doc/generated/examples/libraries_ex3_2.xml b/doc/generated/examples/libraries_ex3_2.xml
index 714ec3e..e5ec4ce 100644
--- a/doc/generated/examples/libraries_ex3_2.xml
+++ b/doc/generated/examples/libraries_ex3_2.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcl /Foprog.obj /c prog.c /nologo
+cl /Foprog.obj /c prog.c /nologo
link /nologo /OUT:prog.exe /LIBPATH:\usr\lib /LIBPATH:\usr\local\lib m.lib prog.obj
embedManifestExeCheck(target, source, env)
</screen>
diff --git a/doc/generated/examples/libraries_objects_1.xml b/doc/generated/examples/libraries_objects_1.xml
index fa80326..5d732da 100644
--- a/doc/generated/examples/libraries_objects_1.xml
+++ b/doc/generated/examples/libraries_objects_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcc -o f1.o -c f1.c
+cc -o f1.o -c f1.c
cc -o f3.o -c f3.c
ar rc libfoo.a f1.o f2.o f3.o f4.o
ranlib libfoo.a
diff --git a/doc/generated/examples/mergeflags_MergeFlags1_1.xml b/doc/generated/examples/mergeflags_MergeFlags1_1.xml
index 1697d6c..8a0c336 100644
--- a/doc/generated/examples/mergeflags_MergeFlags1_1.xml
+++ b/doc/generated/examples/mergeflags_MergeFlags1_1.xml
@@ -7,6 +7,4 @@
^
SyntaxError: invalid syntax
-
-[?1034h
</screen>
diff --git a/doc/generated/examples/mergeflags_MergeFlags2_1.xml b/doc/generated/examples/mergeflags_MergeFlags2_1.xml
index aabdc46..1312c47 100644
--- a/doc/generated/examples/mergeflags_MergeFlags2_1.xml
+++ b/doc/generated/examples/mergeflags_MergeFlags2_1.xml
@@ -7,6 +7,4 @@
^
SyntaxError: invalid syntax
-
-[?1034h
</screen>
diff --git a/doc/generated/examples/mergeflags_MergeFlags3_1.xml b/doc/generated/examples/mergeflags_MergeFlags3_1.xml
index 1697d6c..8a0c336 100644
--- a/doc/generated/examples/mergeflags_MergeFlags3_1.xml
+++ b/doc/generated/examples/mergeflags_MergeFlags3_1.xml
@@ -7,6 +7,4 @@
^
SyntaxError: invalid syntax
-
-[?1034h
</screen>
diff --git a/doc/generated/examples/misc_Exit_1.xml b/doc/generated/examples/misc_Exit_1.xml
index 8f4e0d5..6af378f 100644
--- a/doc/generated/examples/misc_Exit_1.xml
+++ b/doc/generated/examples/misc_Exit_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 -Q FUTURE=1</userinput>
-[?1034hThe FUTURE option is not supported yet!
+The FUTURE option is not supported yet!
% <userinput>scons -Q</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
cc -o hello hello.o
</screen>
diff --git a/doc/generated/examples/misc_FindFile1a_1.xml b/doc/generated/examples/misc_FindFile1a_1.xml
index 5d95aaf..eca0328 100644
--- a/doc/generated/examples/misc_FindFile1a_1.xml
+++ b/doc/generated/examples/misc_FindFile1a_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hNone
+None
&lt;class 'SCons.Node.FS.File'&gt; exists
scons: `.' is up to date.
</screen>
diff --git a/doc/generated/examples/misc_FindFile1b_1.xml b/doc/generated/examples/misc_FindFile1b_1.xml
index 9ce02e5..894b483 100644
--- a/doc/generated/examples/misc_FindFile1b_1.xml
+++ b/doc/generated/examples/misc_FindFile1b_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hnonesuch.h: None
+nonesuch.h: None
config.h: config.h
private.h: src/include/private.h
dist.h: include/dist.h
diff --git a/doc/generated/examples/misc_FindFile1d_1.xml b/doc/generated/examples/misc_FindFile1d_1.xml
index 224cb60..5ab499f 100644
--- a/doc/generated/examples/misc_FindFile1d_1.xml
+++ b/doc/generated/examples/misc_FindFile1d_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hsub1/multiple
+sub1/multiple
sub2/multiple
sub3/multiple
scons: `.' is up to date.
diff --git a/doc/generated/examples/misc_FindFile2_1.xml b/doc/generated/examples/misc_FindFile2_1.xml
index 4f088db..149c5d5 100644
--- a/doc/generated/examples/misc_FindFile2_1.xml
+++ b/doc/generated/examples/misc_FindFile2_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hleaf
+leaf
derived
cat &gt; derived leaf
</screen>
diff --git a/doc/generated/examples/misc_FindFile2_2.xml b/doc/generated/examples/misc_FindFile2_2.xml
index 4f088db..149c5d5 100644
--- a/doc/generated/examples/misc_FindFile2_2.xml
+++ b/doc/generated/examples/misc_FindFile2_2.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hleaf
+leaf
derived
cat &gt; derived leaf
</screen>
diff --git a/doc/generated/examples/misc_FindFile3_1.xml b/doc/generated/examples/misc_FindFile3_1.xml
index 3b3e093..2c09fed 100644
--- a/doc/generated/examples/misc_FindFile3_1.xml
+++ b/doc/generated/examples/misc_FindFile3_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hbuild/leaf
+build/leaf
scons: `.' is up to date.
</screen>
diff --git a/doc/generated/examples/misc_Flatten1_1.xml b/doc/generated/examples/misc_Flatten1_1.xml
index 804dbc2..54720bb 100644
--- a/doc/generated/examples/misc_Flatten1_1.xml
+++ b/doc/generated/examples/misc_Flatten1_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcc -o prog1.o -c prog1.c
+cc -o prog1.o -c prog1.c
cc -o prog2.o -c -DFOO prog2.c
cc -o prog1 prog1.o prog2.o
</screen>
diff --git a/doc/generated/examples/misc_Flatten2_1.xml b/doc/generated/examples/misc_Flatten2_1.xml
index 9237519..66161ec 100644
--- a/doc/generated/examples/misc_Flatten2_1.xml
+++ b/doc/generated/examples/misc_Flatten2_1.xml
@@ -3,5 +3,4 @@
AttributeError: 'NodeList' object has no attribute 'abspath':
File "/home/my/project/SConstruct", line 8:
print(object_file.abspath)
-[?1034h
</screen>
diff --git a/doc/generated/examples/nodes_GetBuildPath_1.xml b/doc/generated/examples/nodes_GetBuildPath_1.xml
index 0000f23..376f65e 100644
--- a/doc/generated/examples/nodes_GetBuildPath_1.xml
+++ b/doc/generated/examples/nodes_GetBuildPath_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034h['foo.c', 'sub/dir/value']
+['foo.c', 'sub/dir/value']
scons: `.' is up to date.
</screen>
diff --git a/doc/generated/examples/nodes_ex1_1.xml b/doc/generated/examples/nodes_ex1_1.xml
index 858e82e..e7eb8c4 100644
--- a/doc/generated/examples/nodes_ex1_1.xml
+++ b/doc/generated/examples/nodes_ex1_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcc -o goodbye.o -c -DGOODBYE goodbye.c
+cc -o goodbye.o -c -DGOODBYE goodbye.c
cc -o hello.o -c -DHELLO hello.c
cc -o hello hello.o goodbye.o
</screen>
diff --git a/doc/generated/examples/nodes_ex1_2.xml b/doc/generated/examples/nodes_ex1_2.xml
index db54d14..a1ed1fb 100644
--- a/doc/generated/examples/nodes_ex1_2.xml
+++ b/doc/generated/examples/nodes_ex1_2.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcl /Fogoodbye.obj /c goodbye.c -DGOODBYE
+cl /Fogoodbye.obj /c goodbye.c -DGOODBYE
cl /Fohello.obj /c hello.c -DHELLO
link /nologo /OUT:hello.exe hello.obj goodbye.obj
embedManifestExeCheck(target, source, env)
diff --git a/doc/generated/examples/nodes_exists_1.xml b/doc/generated/examples/nodes_exists_1.xml
index 4508298..a290b1c 100644
--- a/doc/generated/examples/nodes_exists_1.xml
+++ b/doc/generated/examples/nodes_exists_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hhello does not exist!
+hello does not exist!
cc -o hello.o -c hello.c
cc -o hello hello.o
</screen>
diff --git a/doc/generated/examples/nodes_print_1.xml b/doc/generated/examples/nodes_print_1.xml
index 33e5702..11a3f45 100644
--- a/doc/generated/examples/nodes_print_1.xml
+++ b/doc/generated/examples/nodes_print_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hThe object file is: hello.o
+The object file is: hello.o
The program file is: hello
cc -o hello.o -c hello.c
cc -o hello hello.o
diff --git a/doc/generated/examples/nodes_print_2.xml b/doc/generated/examples/nodes_print_2.xml
index c948a78..a62b522 100644
--- a/doc/generated/examples/nodes_print_2.xml
+++ b/doc/generated/examples/nodes_print_2.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hThe object file is: hello.obj
+The object file is: hello.obj
The program file is: hello.exe
cl /Fohello.obj /c hello.c /nologo
link /nologo /OUT:hello.exe hello.obj
diff --git a/doc/generated/examples/output_Progress-TARGET_1.xml b/doc/generated/examples/output_Progress-TARGET_1.xml
index 78a8e68..b233c6e 100644
--- a/doc/generated/examples/output_Progress-TARGET_1.xml
+++ b/doc/generated/examples/output_Progress-TARGET_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hEvaluating SConstruct
+Evaluating SConstruct
Evaluating f1.c
Evaluating f1.o
cc -o f1.o -c f1.c
diff --git a/doc/generated/examples/output_ex1_1.xml b/doc/generated/examples/output_ex1_1.xml
index f83cfb9..535960b 100644
--- a/doc/generated/examples/output_ex1_1.xml
+++ b/doc/generated/examples/output_ex1_1.xml
@@ -1,6 +1,6 @@
<?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 -h</userinput>
-[?1034hscons: Reading SConscript files ...
+scons: Reading SConscript files ...
scons: done reading SConscript files.
Type: 'scons program' to build the production program,
diff --git a/doc/generated/examples/output_ex2_1.xml b/doc/generated/examples/output_ex2_1.xml
index a877dbf..e951c3a 100644
--- a/doc/generated/examples/output_ex2_1.xml
+++ b/doc/generated/examples/output_ex2_1.xml
@@ -1,6 +1,6 @@
<?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 -h</userinput>
-[?1034hscons: Reading SConscript files ...
+scons: Reading SConscript files ...
scons: done reading SConscript files.
Type: 'scons program' to build the production program.
diff --git a/doc/generated/examples/output_ex2_2.xml b/doc/generated/examples/output_ex2_2.xml
index 5a6be24..8dca6c3 100644
--- a/doc/generated/examples/output_ex2_2.xml
+++ b/doc/generated/examples/output_ex2_2.xml
@@ -1,6 +1,6 @@
<?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 -h</userinput>
-[?1034hscons: Reading SConscript files ...
+scons: Reading SConscript files ...
scons: done reading SConscript files.
Type: 'scons program' to build the production program.
diff --git a/doc/generated/examples/output_gbf2_1.xml b/doc/generated/examples/output_gbf2_1.xml
index ee5906c..c31b41a 100644
--- a/doc/generated/examples/output_gbf2_1.xml
+++ b/doc/generated/examples/output_gbf2_1.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">% <userinput>scons -Q</userinput>
-[?1034hscons: `.' is up to date.
+scons: `.' is up to date.
Build succeeded.
% <userinput>scons -Q fail=1</userinput>
scons: *** [target] Source `source' not found, needed by target `target'.
-[?1034hFAILED!!!!
+FAILED!!!!
Failed building target: Source `source' not found, needed by target `target'.
</screen>
diff --git a/doc/generated/examples/parseflags_ex1_1.xml b/doc/generated/examples/parseflags_ex1_1.xml
index 6e5e720..79cdad6 100644
--- a/doc/generated/examples/parseflags_ex1_1.xml
+++ b/doc/generated/examples/parseflags_ex1_1.xml
@@ -7,6 +7,4 @@
^
SyntaxError: invalid syntax
-
-[?1034h
</screen>
diff --git a/doc/generated/examples/parseflags_ex1_2.xml b/doc/generated/examples/parseflags_ex1_2.xml
index ccd4b57..b9c9cd2 100644
--- a/doc/generated/examples/parseflags_ex1_2.xml
+++ b/doc/generated/examples/parseflags_ex1_2.xml
@@ -7,6 +7,4 @@
^
SyntaxError: invalid syntax
-
-[?1034h
</screen>
diff --git a/doc/generated/examples/parseflags_ex2_1.xml b/doc/generated/examples/parseflags_ex2_1.xml
index 6e5e720..79cdad6 100644
--- a/doc/generated/examples/parseflags_ex2_1.xml
+++ b/doc/generated/examples/parseflags_ex2_1.xml
@@ -7,6 +7,4 @@
^
SyntaxError: invalid syntax
-
-[?1034h
</screen>
diff --git a/doc/generated/examples/parseflags_ex3_1.xml b/doc/generated/examples/parseflags_ex3_1.xml
index 6e5e720..79cdad6 100644
--- a/doc/generated/examples/parseflags_ex3_1.xml
+++ b/doc/generated/examples/parseflags_ex3_1.xml
@@ -7,6 +7,4 @@
^
SyntaxError: invalid syntax
-
-[?1034h
</screen>
diff --git a/doc/generated/examples/parseflags_ex4_1.xml b/doc/generated/examples/parseflags_ex4_1.xml
index 6e5e720..79cdad6 100644
--- a/doc/generated/examples/parseflags_ex4_1.xml
+++ b/doc/generated/examples/parseflags_ex4_1.xml
@@ -7,6 +7,4 @@
^
SyntaxError: invalid syntax
-
-[?1034h
</screen>
diff --git a/doc/generated/examples/repositories_CPPPATH3_1.xml b/doc/generated/examples/repositories_CPPPATH3_1.xml
index 57af257..d53ffdb 100644
--- a/doc/generated/examples/repositories_CPPPATH3_1.xml
+++ b/doc/generated/examples/repositories_CPPPATH3_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hcc -o hello.o -c -Idir1 -I/r1/dir1 -I/r2/dir1 -Idir2 -I/r1/dir2 -I/r2/dir2 -Idir3 -I/r1/dir3 -I/r2/dir3 hello.c
+cc -o hello.o -c -Idir1 -I/r1/dir1 -I/r2/dir1 -Idir2 -I/r1/dir2 -I/r2/dir2 -Idir3 -I/r1/dir3 -I/r2/dir3 hello.c
cc -o hello hello.o
</screen>
diff --git a/doc/generated/examples/repositories_CPPPATH_1.xml b/doc/generated/examples/repositories_CPPPATH_1.xml
index 7e701f2..6c5a2d1 100644
--- a/doc/generated/examples/repositories_CPPPATH_1.xml
+++ b/doc/generated/examples/repositories_CPPPATH_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hcc -o hello.o -c -I. -I/usr/repository1 hello.c
+cc -o hello.o -c -I. -I/usr/repository1 hello.c
cc -o hello hello.o
</screen>
diff --git a/doc/generated/examples/repositories_ex1_1.xml b/doc/generated/examples/repositories_ex1_1.xml
index 18ce76b..a21fdc8 100644
--- a/doc/generated/examples/repositories_ex1_1.xml
+++ b/doc/generated/examples/repositories_ex1_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hcc -o hello.o -c hello.c
+cc -o hello.o -c hello.c
cc -o hello hello.o
</screen>
diff --git a/doc/generated/examples/repositories_ex2_1.xml b/doc/generated/examples/repositories_ex2_1.xml
index beee012..819c936 100644
--- a/doc/generated/examples/repositories_ex2_1.xml
+++ b/doc/generated/examples/repositories_ex2_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hcc -o hello.o -c /usr/repository1/hello.c
+cc -o hello.o -c /usr/repository1/hello.c
cc -o hello hello.o
</screen>
diff --git a/doc/generated/examples/repositories_ex3_1.xml b/doc/generated/examples/repositories_ex3_1.xml
index 9c1011f..76d69cd 100644
--- a/doc/generated/examples/repositories_ex3_1.xml
+++ b/doc/generated/examples/repositories_ex3_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hcc -o hello.o -c /usr/repository2/hello.c
+cc -o hello.o -c /usr/repository2/hello.c
cc -o hello hello.o
</screen>
diff --git a/doc/generated/examples/repositories_ex4_1.xml b/doc/generated/examples/repositories_ex4_1.xml
index 2b68208..8911683 100644
--- a/doc/generated/examples/repositories_ex4_1.xml
+++ b/doc/generated/examples/repositories_ex4_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>cd /usr/repository1</userinput>
% <userinput>scons -Q</userinput>
-[?1034hcc -o file1.o -c file1.c
+cc -o file1.o -c file1.c
cc -o file2.o -c file2.c
cc -o hello.o -c hello.c
cc -o hello hello.o file1.o file2.o
diff --git a/doc/generated/examples/repositories_quote1_1.xml b/doc/generated/examples/repositories_quote1_1.xml
index 02f387f..d2ba624 100644
--- a/doc/generated/examples/repositories_quote1_1.xml
+++ b/doc/generated/examples/repositories_quote1_1.xml
@@ -1,5 +1,5 @@
<?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 -Q</userinput>
-[?1034hcc -o hello.o -c -I. -I/usr/repository1 /usr/repository1/hello.c
+cc -o hello.o -c -I. -I/usr/repository1 /usr/repository1/hello.c
cc -o hello hello.o
</screen>
diff --git a/doc/generated/examples/separate_builddir_1.xml b/doc/generated/examples/separate_builddir_1.xml
index 5cba77c..a763172 100644
--- a/doc/generated/examples/separate_builddir_1.xml
+++ b/doc/generated/examples/separate_builddir_1.xml
@@ -2,7 +2,7 @@
<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>ls src</userinput>
hello.c
% <userinput>scons -Q</userinput>
-[?1034hcc -o build/hello.o -c build/hello.c
+cc -o build/hello.o -c build/hello.c
cc -o build/hello build/hello.o
% <userinput>ls build</userinput>
hello hello.c hello.o
diff --git a/doc/generated/examples/separate_builddir_sconscript_1.xml b/doc/generated/examples/separate_builddir_sconscript_1.xml
index d78fadb..5694a56 100644
--- a/doc/generated/examples/separate_builddir_sconscript_1.xml
+++ b/doc/generated/examples/separate_builddir_sconscript_1.xml
@@ -2,7 +2,7 @@
<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>ls src</userinput>
SConscript hello.c
% <userinput>scons -Q</userinput>
-[?1034hcc -o build/hello.o -c build/hello.c
+cc -o build/hello.o -c build/hello.c
cc -o build/hello build/hello.o
% <userinput>ls build</userinput>
SConscript hello hello.c hello.o
diff --git a/doc/generated/examples/separate_duplicate0_1.xml b/doc/generated/examples/separate_duplicate0_1.xml
index a21e32b..207c5d7 100644
--- a/doc/generated/examples/separate_duplicate0_1.xml
+++ b/doc/generated/examples/separate_duplicate0_1.xml
@@ -2,7 +2,7 @@
<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>ls src</userinput>
hello.c
% <userinput>scons -Q</userinput>
-[?1034hcc -o build/hello.o -c src/hello.c
+cc -o build/hello.o -c src/hello.c
cc -o build/hello build/hello.o
% <userinput>ls build</userinput>
hello hello.o
diff --git a/doc/generated/examples/separate_ex1_1.xml b/doc/generated/examples/separate_ex1_1.xml
index d78fadb..5694a56 100644
--- a/doc/generated/examples/separate_ex1_1.xml
+++ b/doc/generated/examples/separate_ex1_1.xml
@@ -2,7 +2,7 @@
<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>ls src</userinput>
SConscript hello.c
% <userinput>scons -Q</userinput>
-[?1034hcc -o build/hello.o -c build/hello.c
+cc -o build/hello.o -c build/hello.c
cc -o build/hello build/hello.o
% <userinput>ls build</userinput>
SConscript hello hello.c hello.o
diff --git a/doc/generated/examples/separate_glob_builddir_sconscript_1.xml b/doc/generated/examples/separate_glob_builddir_sconscript_1.xml
index d4e69c7..7cdb420 100644
--- a/doc/generated/examples/separate_glob_builddir_sconscript_1.xml
+++ b/doc/generated/examples/separate_glob_builddir_sconscript_1.xml
@@ -2,7 +2,7 @@
<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>ls src</userinput>
SConscript f1.c f2.c f2.h
% <userinput>scons -Q</userinput>
-[?1034hcc -o build/f1.o -c build/f1.c
+cc -o build/f1.o -c build/f1.c
cc -o build/f2.o -c build/f2.c
cc -o build/hello build/f1.o build/f2.o
% <userinput>ls build</userinput>
diff --git a/doc/generated/examples/sideeffect_parallel_1.xml b/doc/generated/examples/sideeffect_parallel_1.xml
index 6f5ee14..9478c52 100644
--- a/doc/generated/examples/sideeffect_parallel_1.xml
+++ b/doc/generated/examples/sideeffect_parallel_1.xml
@@ -1,5 +1,5 @@
<?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 -Q --jobs=2</userinput>
-[?1034hecho &gt; file1.out data1
+echo &gt; file1.out data1
echo &gt; file2.out data2
</screen>
diff --git a/doc/generated/examples/sideeffect_shared_1.xml b/doc/generated/examples/sideeffect_shared_1.xml
index 34c8b94..2abb806 100644
--- a/doc/generated/examples/sideeffect_shared_1.xml
+++ b/doc/generated/examples/sideeffect_shared_1.xml
@@ -1,5 +1,5 @@
<?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 -Q --jobs=2</userinput>
-[?1034h./build --log logfile.txt file1.in file1.out
+./build --log logfile.txt file1.in file1.out
./build --log logfile.txt file2.in file2.out
</screen>
diff --git a/doc/generated/examples/sideeffect_simple_1.xml b/doc/generated/examples/sideeffect_simple_1.xml
index 361c97a..e88630c 100644
--- a/doc/generated/examples/sideeffect_simple_1.xml
+++ b/doc/generated/examples/sideeffect_simple_1.xml
@@ -7,6 +7,4 @@
^
SyntaxError: invalid syntax
-
-[?1034h
</screen>
diff --git a/doc/generated/examples/simple_Object_1.xml b/doc/generated/examples/simple_Object_1.xml
index 7b98f8d..6d5c80d 100644
--- a/doc/generated/examples/simple_Object_1.xml
+++ b/doc/generated/examples/simple_Object_1.xml
@@ -1,6 +1,6 @@
<?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>
-[?1034hscons: Reading SConscript files ...
+scons: Reading SConscript files ...
scons: done reading SConscript files.
scons: Building targets ...
cc -o hello.o -c hello.c
diff --git a/doc/generated/examples/simple_Object_2.xml b/doc/generated/examples/simple_Object_2.xml
index 86f816d..3686006 100644
--- a/doc/generated/examples/simple_Object_2.xml
+++ b/doc/generated/examples/simple_Object_2.xml
@@ -1,6 +1,6 @@
<?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>
-[?1034hscons: Reading SConscript files ...
+scons: Reading SConscript files ...
scons: done reading SConscript files.
scons: Building targets ...
cl /Fohello.obj /c hello.c /nologo
diff --git a/doc/generated/examples/simple_clean_1.xml b/doc/generated/examples/simple_clean_1.xml
index fffdb38..21adbe7 100644
--- a/doc/generated/examples/simple_clean_1.xml
+++ b/doc/generated/examples/simple_clean_1.xml
@@ -1,13 +1,13 @@
<?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>
-[?1034hscons: Reading SConscript files ...
+scons: Reading SConscript files ...
scons: done reading SConscript files.
scons: Building targets ...
cc -o hello.o -c hello.c
cc -o hello hello.o
scons: done building targets.
% <userinput>scons -c</userinput>
-[?1034hscons: Reading SConscript files ...
+scons: Reading SConscript files ...
scons: done reading SConscript files.
scons: Cleaning targets ...
Removed hello.o
diff --git a/doc/generated/examples/simple_clean_2.xml b/doc/generated/examples/simple_clean_2.xml
index b0ec400..26f3c37 100644
--- a/doc/generated/examples/simple_clean_2.xml
+++ b/doc/generated/examples/simple_clean_2.xml
@@ -1,6 +1,6 @@
<?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>
-[?1034hscons: Reading SConscript files ...
+scons: Reading SConscript files ...
scons: done reading SConscript files.
scons: Building targets ...
cl /Fohello.obj /c hello.c /nologo
@@ -8,7 +8,7 @@ link /nologo /OUT:hello.exe hello.obj
embedManifestExeCheck(target, source, env)
scons: done building targets.
C:\&gt;<userinput>scons -c</userinput>
-[?1034hscons: Reading SConscript files ...
+scons: Reading SConscript files ...
scons: done reading SConscript files.
scons: Cleaning targets ...
Removed hello.obj
diff --git a/doc/generated/examples/simple_declarative_1.xml b/doc/generated/examples/simple_declarative_1.xml
index 4733089..01061cf 100644
--- a/doc/generated/examples/simple_declarative_1.xml
+++ b/doc/generated/examples/simple_declarative_1.xml
@@ -1,6 +1,6 @@
<?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>
-[?1034hscons: Reading SConscript files ...
+scons: Reading SConscript files ...
Calling Program('hello.c')
Calling Program('goodbye.c')
Finished calling Program()
diff --git a/doc/generated/examples/simple_ex1_1.xml b/doc/generated/examples/simple_ex1_1.xml
index e3b9262..5833ede 100644
--- a/doc/generated/examples/simple_ex1_1.xml
+++ b/doc/generated/examples/simple_ex1_1.xml
@@ -1,6 +1,6 @@
<?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>
-[?1034hscons: Reading SConscript files ...
+scons: Reading SConscript files ...
scons: done reading SConscript files.
scons: Building targets ...
cc -o hello.o -c hello.c
diff --git a/doc/generated/examples/simple_ex1_2.xml b/doc/generated/examples/simple_ex1_2.xml
index 91257dd..f0e07a1 100644
--- a/doc/generated/examples/simple_ex1_2.xml
+++ b/doc/generated/examples/simple_ex1_2.xml
@@ -1,6 +1,6 @@
<?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>
-[?1034hscons: Reading SConscript files ...
+scons: Reading SConscript files ...
scons: done reading SConscript files.
scons: Building targets ...
cl /Fohello.obj /c hello.c /nologo
diff --git a/doc/generated/examples/simple_ex1_3.xml b/doc/generated/examples/simple_ex1_3.xml
index 91257dd..f0e07a1 100644
--- a/doc/generated/examples/simple_ex1_3.xml
+++ b/doc/generated/examples/simple_ex1_3.xml
@@ -1,6 +1,6 @@
<?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>
-[?1034hscons: Reading SConscript files ...
+scons: Reading SConscript files ...
scons: done reading SConscript files.
scons: Building targets ...
cl /Fohello.obj /c hello.c /nologo
diff --git a/doc/generated/examples/simple_ex1_4.xml b/doc/generated/examples/simple_ex1_4.xml
index ea6c6a9..80c7b63 100644
--- a/doc/generated/examples/simple_ex1_4.xml
+++ b/doc/generated/examples/simple_ex1_4.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcl /Fohello.obj /c hello.c /nologo
+cl /Fohello.obj /c hello.c /nologo
link /nologo /OUT:hello.exe hello.obj
embedManifestExeCheck(target, source, env)
</screen>
diff --git a/doc/generated/examples/simple_java_1.xml b/doc/generated/examples/simple_java_1.xml
index 16f8c28..75cc6cc 100644
--- a/doc/generated/examples/simple_java_1.xml
+++ b/doc/generated/examples/simple_java_1.xml
@@ -1,6 +1,6 @@
<?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>
-[?1034hscons: Reading SConscript files ...
+scons: Reading SConscript files ...
scons: done reading SConscript files.
scons: Building targets ...
javac -d classes -sourcepath src src/hello.java
diff --git a/doc/generated/examples/sourcecode_bitkeeper_1.xml b/doc/generated/examples/sourcecode_bitkeeper_1.xml
index 71c656a..a070ada 100644
--- a/doc/generated/examples/sourcecode_bitkeeper_1.xml
+++ b/doc/generated/examples/sourcecode_bitkeeper_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hbk get hello.c
+bk get hello.c
cc -o hello.o -c hello.c
cc -o hello hello.o
</screen>
diff --git a/doc/generated/examples/sourcecode_cvs_1.xml b/doc/generated/examples/sourcecode_cvs_1.xml
index a2da87f..9ec7cd4 100644
--- a/doc/generated/examples/sourcecode_cvs_1.xml
+++ b/doc/generated/examples/sourcecode_cvs_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcvs -d /usr/local/CVS co hello.c
+cvs -d /usr/local/CVS co hello.c
cc -o hello.o -c hello.c
cc -o hello hello.o
</screen>
diff --git a/doc/generated/examples/sourcecode_rcs_1.xml b/doc/generated/examples/sourcecode_rcs_1.xml
index abb8448..5e120eb 100644
--- a/doc/generated/examples/sourcecode_rcs_1.xml
+++ b/doc/generated/examples/sourcecode_rcs_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hco hello.c
+co hello.c
cc -o hello.o -c hello.c
cc -o hello hello.o
</screen>
diff --git a/doc/generated/examples/sourcecode_sccs_1.xml b/doc/generated/examples/sourcecode_sccs_1.xml
index fb0e112..354b680 100644
--- a/doc/generated/examples/sourcecode_sccs_1.xml
+++ b/doc/generated/examples/sourcecode_sccs_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hsccs get hello.c
+sccs get hello.c
cc -o hello.o -c hello.c
cc -o hello hello.o
</screen>
diff --git a/doc/generated/examples/tasks_ex1_1.xml b/doc/generated/examples/tasks_ex1_1.xml
index 85ca58a..4885fde 100644
--- a/doc/generated/examples/tasks_ex1_1.xml
+++ b/doc/generated/examples/tasks_ex1_1.xml
@@ -1,6 +1,6 @@
<?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 -Q</userinput>
-[?1034hcat &lt; test.bar &gt; test.h
+cat &lt; test.bar &gt; test.h
cc -o app main.cpp
cat &lt; foo.bar2 &gt; foo.cpp
cc -o app2 main2.cpp foo.cpp
diff --git a/doc/generated/examples/troubleshoot_Dump_1.xml b/doc/generated/examples/troubleshoot_Dump_1.xml
index f939ad7..281fed7 100644
--- a/doc/generated/examples/troubleshoot_Dump_1.xml
+++ b/doc/generated/examples/troubleshoot_Dump_1.xml
@@ -1,6 +1,6 @@
<?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>
-[?1034hscons: Reading SConscript files ...
+scons: Reading SConscript files ...
File "/home/my/project/SConstruct", line 2
print env.Dump()
diff --git a/doc/generated/examples/troubleshoot_Dump_2.xml b/doc/generated/examples/troubleshoot_Dump_2.xml
index dee98f4..78cd84b 100644
--- a/doc/generated/examples/troubleshoot_Dump_2.xml
+++ b/doc/generated/examples/troubleshoot_Dump_2.xml
@@ -1,6 +1,6 @@
<?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>
-[?1034hscons: Reading SConscript files ...
+scons: Reading SConscript files ...
File "/home/my/project/SConstruct", line 2
print env.Dump()
diff --git a/doc/generated/examples/troubleshoot_Dump_ENV_1.xml b/doc/generated/examples/troubleshoot_Dump_ENV_1.xml
index ca6fdbd..bd674a6 100644
--- a/doc/generated/examples/troubleshoot_Dump_ENV_1.xml
+++ b/doc/generated/examples/troubleshoot_Dump_ENV_1.xml
@@ -1,6 +1,6 @@
<?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>
-[?1034hscons: Reading SConscript files ...
+scons: Reading SConscript files ...
File "/home/my/project/SConstruct", line 2
print env.Dump('ENV')
diff --git a/doc/generated/examples/troubleshoot_Dump_ENV_2.xml b/doc/generated/examples/troubleshoot_Dump_ENV_2.xml
index d94656a..c9f9258 100644
--- a/doc/generated/examples/troubleshoot_Dump_ENV_2.xml
+++ b/doc/generated/examples/troubleshoot_Dump_ENV_2.xml
@@ -1,6 +1,6 @@
<?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>
-[?1034hscons: Reading SConscript files ...
+scons: Reading SConscript files ...
File "/home/my/project/SConstruct", line 2
print env.Dump('ENV')
diff --git a/doc/generated/examples/troubleshoot_explain1_1.xml b/doc/generated/examples/troubleshoot_explain1_1.xml
index 9ce68da..2a9547d 100644
--- a/doc/generated/examples/troubleshoot_explain1_1.xml
+++ b/doc/generated/examples/troubleshoot_explain1_1.xml
@@ -1,8 +1,8 @@
<?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 -Q</userinput>
-[?1034hcp file.in file.oout
+cp file.in file.oout
% <userinput>scons -Q</userinput>
-[?1034hcp file.in file.oout
+cp file.in file.oout
% <userinput>scons -Q</userinput>
-[?1034hcp file.in file.oout
+cp file.in file.oout
</screen>
diff --git a/doc/generated/examples/troubleshoot_explain1_2.xml b/doc/generated/examples/troubleshoot_explain1_2.xml
index f12ba00..9864cd7 100644
--- a/doc/generated/examples/troubleshoot_explain1_2.xml
+++ b/doc/generated/examples/troubleshoot_explain1_2.xml
@@ -1,5 +1,5 @@
<?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 -Q --debug=explain</userinput>
-[?1034hscons: building `file.out' because it doesn't exist
+scons: building `file.out' because it doesn't exist
cp file.in file.oout
</screen>
diff --git a/doc/generated/examples/troubleshoot_explain1_3.xml b/doc/generated/examples/troubleshoot_explain1_3.xml
index 702da50..36d9139 100644
--- a/doc/generated/examples/troubleshoot_explain1_3.xml
+++ b/doc/generated/examples/troubleshoot_explain1_3.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 -Q --warn=target-not-built</userinput>
-[?1034hcp file.in file.oout
+cp file.in file.oout
scons: warning: Cannot find target file.out after building
-File "/Users/bdbaddog/devel/scons/hg/scons/src/script/scons.py", line 201, in &lt;module&gt;
+File "/home/bdbaddog/devel/scons/scons/src/script/scons.py", line 201, in &lt;module&gt;
</screen>
diff --git a/doc/generated/examples/troubleshoot_explain2_1.xml b/doc/generated/examples/troubleshoot_explain2_1.xml
index 3f9fdae..cd95a44 100644
--- a/doc/generated/examples/troubleshoot_explain2_1.xml
+++ b/doc/generated/examples/troubleshoot_explain2_1.xml
@@ -1,12 +1,12 @@
<?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 -Q</userinput>
-[?1034hcc -o file1.o -c file1.c
+cc -o file1.o -c file1.c
cc -o file2.o -c file2.c
cc -o file3.o -c file3.c
cc -o prog file1.o file2.o file3.o
% [CHANGE THE CONTENTS OF file2.c]
% <userinput>scons -Q --debug=explain</userinput>
-[?1034hscons: rebuilding `file2.o' because `file2.c' changed
+scons: rebuilding `file2.o' because `file2.c' changed
cc -o file2.o -c file2.c
scons: rebuilding `prog' because `file2.o' changed
cc -o prog file1.o file2.o file3.o
diff --git a/doc/generated/examples/troubleshoot_explain3_1.xml b/doc/generated/examples/troubleshoot_explain3_1.xml
index d52110f..bacb7e8 100644
--- a/doc/generated/examples/troubleshoot_explain3_1.xml
+++ b/doc/generated/examples/troubleshoot_explain3_1.xml
@@ -1,12 +1,12 @@
<?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 -Q</userinput>
-[?1034hcc -o file1.o -c -I. file1.c
+cc -o file1.o -c -I. file1.c
cc -o file2.o -c -I. file2.c
cc -o file3.o -c -I. file3.c
cc -o prog file1.o file2.o file3.o
% [CHANGE THE CONTENTS OF hello.h]
% <userinput>scons -Q --debug=explain</userinput>
-[?1034hscons: rebuilding `file1.o' because `hello.h' changed
+scons: rebuilding `file1.o' because `hello.h' changed
cc -o file1.o -c -I. file1.c
scons: rebuilding `file3.o' because `hello.h' changed
cc -o file3.o -c -I. file3.c
diff --git a/doc/generated/examples/troubleshoot_findlibs_1.xml b/doc/generated/examples/troubleshoot_findlibs_1.xml
index 95f317c..8fc4e5f 100644
--- a/doc/generated/examples/troubleshoot_findlibs_1.xml
+++ b/doc/generated/examples/troubleshoot_findlibs_1.xml
@@ -1,6 +1,6 @@
<?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 -Q --debug=findlibs</userinput>
-[?1034h findlibs: looking for 'libfoo.a' in 'libs1' ...
+ findlibs: looking for 'libfoo.a' in 'libs1' ...
findlibs: ... FOUND 'libfoo.a' in 'libs1'
findlibs: looking for 'libfoo.so' in 'libs1' ...
findlibs: looking for 'libfoo.so' in 'libs2' ...
diff --git a/doc/generated/examples/troubleshoot_stacktrace_1.xml b/doc/generated/examples/troubleshoot_stacktrace_1.xml
index a048468..cc3ca7b 100644
--- a/doc/generated/examples/troubleshoot_stacktrace_1.xml
+++ b/doc/generated/examples/troubleshoot_stacktrace_1.xml
@@ -1,5 +1,4 @@
<?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 -Q</userinput>
scons: *** [prog.o] Source `prog.c' not found, needed by target `prog.o'.
-[?1034h
</screen>
diff --git a/doc/generated/examples/troubleshoot_stacktrace_2.xml b/doc/generated/examples/troubleshoot_stacktrace_2.xml
index 9a76147..dc1292e 100644
--- a/doc/generated/examples/troubleshoot_stacktrace_2.xml
+++ b/doc/generated/examples/troubleshoot_stacktrace_2.xml
@@ -10,5 +10,4 @@ scons: internal stack trace:
executor.prepare()
File "bootstrap/src/engine/SCons/Executor.py", line 430, in prepare
raise SCons.Errors.StopError(msg % (s, self.batches[0].targets[0]))
-[?1034h
</screen>
diff --git a/doc/generated/examples/troubleshoot_taskmastertrace_1.xml b/doc/generated/examples/troubleshoot_taskmastertrace_1.xml
index 3ea9fd0..578951d 100644
--- a/doc/generated/examples/troubleshoot_taskmastertrace_1.xml
+++ b/doc/generated/examples/troubleshoot_taskmastertrace_1.xml
@@ -1,6 +1,6 @@
<?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 -Q --taskmastertrace=- prog</userinput>
-[?1034h
+
Taskmaster: Looking for a node to evaluate
Taskmaster: Considering node &lt;no_state 0 'prog'&gt; and its children:
Taskmaster: &lt;no_state 0 'prog.o'&gt;
diff --git a/doc/generated/examples/troubleshoot_tree1_1.xml b/doc/generated/examples/troubleshoot_tree1_1.xml
index 882f625..4ccadc6 100644
--- a/doc/generated/examples/troubleshoot_tree1_1.xml
+++ b/doc/generated/examples/troubleshoot_tree1_1.xml
@@ -1,6 +1,6 @@
<?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 -Q --tree=all</userinput>
-[?1034hcc -o f1.o -c -I. f1.c
+cc -o f1.o -c -I. f1.c
cc -o f2.o -c -I. f2.c
cc -o f3.o -c -I. f3.c
cc -o prog f1.o f2.o f3.o
diff --git a/doc/generated/examples/troubleshoot_tree1_2.xml b/doc/generated/examples/troubleshoot_tree1_2.xml
index 6a14eb4..0bd4874 100644
--- a/doc/generated/examples/troubleshoot_tree1_2.xml
+++ b/doc/generated/examples/troubleshoot_tree1_2.xml
@@ -1,6 +1,6 @@
<?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 -Q --tree=all f2.o</userinput>
-[?1034hcc -o f2.o -c -I. f2.c
+cc -o f2.o -c -I. f2.c
+-f2.o
+-f2.c
+-inc.h
diff --git a/doc/generated/examples/troubleshoot_tree1_3.xml b/doc/generated/examples/troubleshoot_tree1_3.xml
index c6ab142..75fa841 100644
--- a/doc/generated/examples/troubleshoot_tree1_3.xml
+++ b/doc/generated/examples/troubleshoot_tree1_3.xml
@@ -1,6 +1,6 @@
<?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 -Q --tree=all f1.o f3.o</userinput>
-[?1034hcc -o f1.o -c -I. f1.c
+cc -o f1.o -c -I. f1.c
+-f1.o
+-f1.c
+-inc.h
diff --git a/doc/generated/examples/troubleshoot_tree1_4.xml b/doc/generated/examples/troubleshoot_tree1_4.xml
index 453234b..409bce9 100644
--- a/doc/generated/examples/troubleshoot_tree1_4.xml
+++ b/doc/generated/examples/troubleshoot_tree1_4.xml
@@ -1,6 +1,6 @@
<?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 -Q --tree=status</userinput>
-[?1034hcc -o f1.o -c -I. f1.c
+cc -o f1.o -c -I. f1.c
cc -o f2.o -c -I. f2.c
cc -o f3.o -c -I. f3.c
cc -o prog f1.o f2.o f3.o
diff --git a/doc/generated/examples/troubleshoot_tree1_5.xml b/doc/generated/examples/troubleshoot_tree1_5.xml
index 74b502c..b852ab0 100644
--- a/doc/generated/examples/troubleshoot_tree1_5.xml
+++ b/doc/generated/examples/troubleshoot_tree1_5.xml
@@ -1,6 +1,6 @@
<?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 -Q --tree=derived</userinput>
-[?1034hcc -o f1.o -c -I. f1.c
+cc -o f1.o -c -I. f1.c
cc -o f2.o -c -I. f2.c
cc -o f3.o -c -I. f3.c
cc -o prog f1.o f2.o f3.o
diff --git a/doc/generated/examples/troubleshoot_tree1_6.xml b/doc/generated/examples/troubleshoot_tree1_6.xml
index ec25851..a0d42d7 100644
--- a/doc/generated/examples/troubleshoot_tree1_6.xml
+++ b/doc/generated/examples/troubleshoot_tree1_6.xml
@@ -1,6 +1,6 @@
<?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 -Q --tree=derived,status</userinput>
-[?1034hcc -o f1.o -c -I. f1.c
+cc -o f1.o -c -I. f1.c
cc -o f2.o -c -I. f2.c
cc -o f3.o -c -I. f3.c
cc -o prog f1.o f2.o f3.o
diff --git a/doc/generated/examples/troubleshoot_tree2_1.xml b/doc/generated/examples/troubleshoot_tree2_1.xml
index 08f29fa..85febf5 100644
--- a/doc/generated/examples/troubleshoot_tree2_1.xml
+++ b/doc/generated/examples/troubleshoot_tree2_1.xml
@@ -1,6 +1,6 @@
<?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 -Q --tree=all</userinput>
-[?1034hcc -o f1.o -c -I. f1.c
+cc -o f1.o -c -I. f1.c
cc -o f2.o -c -I. f2.c
cc -o f3.o -c -I. f3.c
ar rc libfoo.a f1.o f2.o f3.o
diff --git a/doc/generated/examples/troubleshoot_tree2_2.xml b/doc/generated/examples/troubleshoot_tree2_2.xml
index e574184..5380fad 100644
--- a/doc/generated/examples/troubleshoot_tree2_2.xml
+++ b/doc/generated/examples/troubleshoot_tree2_2.xml
@@ -1,6 +1,6 @@
<?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 -Q --tree=prune</userinput>
-[?1034hcc -o f1.o -c -I. f1.c
+cc -o f1.o -c -I. f1.c
cc -o f2.o -c -I. f2.c
cc -o f3.o -c -I. f3.c
ar rc libfoo.a f1.o f2.o f3.o
diff --git a/doc/generated/examples/variants_ex_1.xml b/doc/generated/examples/variants_ex_1.xml
index 745073f..12a14d6 100644
--- a/doc/generated/examples/variants_ex_1.xml
+++ b/doc/generated/examples/variants_ex_1.xml
@@ -1,6 +1,6 @@
<?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 -Q OS=linux</userinput>
-[?1034hInstall file: "build/linux/world/world.h" as "export/linux/include/world.h"
+Install file: "build/linux/world/world.h" as "export/linux/include/world.h"
cc -o build/linux/hello/hello.o -c -Iexport/linux/include build/linux/hello/hello.c
cc -o build/linux/world/world.o -c -Iexport/linux/include build/linux/world/world.c
ar rc build/linux/world/libworld.a build/linux/world/world.o
diff --git a/doc/generated/examples/variants_ex_2.xml b/doc/generated/examples/variants_ex_2.xml
index 2dc5a28..c129cc4 100644
--- a/doc/generated/examples/variants_ex_2.xml
+++ b/doc/generated/examples/variants_ex_2.xml
@@ -1,6 +1,6 @@
<?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 -Q OS=windows</userinput>
-[?1034hInstall file: "build/windows/world/world.h" as "export/windows/include/world.h"
+Install file: "build/windows/world/world.h" as "export/windows/include/world.h"
cl /Fobuild\windows\hello\hello.obj /c build\windows\hello\hello.c /nologo /Iexport\windows\include
cl /Fobuild\windows\world\world.obj /c build\windows\world\world.c /nologo /Iexport\windows\include
lib /nologo /OUT:build\windows\world\world.lib build\windows\world\world.obj
diff --git a/doc/generated/tools.gen b/doc/generated/tools.gen
index 0de9e03..e3bc27f 100644
--- a/doc/generated/tools.gen
+++ b/doc/generated/tools.gen
@@ -778,19 +778,19 @@ Sets construction variables for the
</para>
<para>Sets: &cv-link-AS;, &cv-link-ASCOM;, &cv-link-ASFLAGS;, &cv-link-ASPPCOM;, &cv-link-ASPPFLAGS;.</para><para>Uses: &cv-link-ASCOMSTR;, &cv-link-ASPPCOMSTR;.</para></listitem>
</varlistentry>
- <varlistentry id="t-packaging">
- <term>packaging</term>
+ <varlistentry id="t-Packaging">
+ <term>Packaging</term>
<listitem>
<para xmlns="http://www.scons.org/dbxsd/v1.0">
-A framework for building binary and source packages.
+Sets construction variables for the <function xmlns="http://www.scons.org/dbxsd/v1.0">Package</function> Builder.
</para>
</listitem>
</varlistentry>
- <varlistentry id="t-Packaging">
- <term>Packaging</term>
+ <varlistentry id="t-packaging">
+ <term>packaging</term>
<listitem>
<para xmlns="http://www.scons.org/dbxsd/v1.0">
-Sets construction variables for the <function xmlns="http://www.scons.org/dbxsd/v1.0">Package</function> Builder.
+A framework for building binary and source packages.
</para>
</listitem>
</varlistentry>
diff --git a/doc/generated/tools.mod b/doc/generated/tools.mod
index f9bc1d7..1209d74 100644
--- a/doc/generated/tools.mod
+++ b/doc/generated/tools.mod
@@ -78,8 +78,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT.
<!ENTITY t-mwcc "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>mwcc</literal>">
<!ENTITY t-mwld "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>mwld</literal>">
<!ENTITY t-nasm "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>nasm</literal>">
-<!ENTITY t-packaging "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>packaging</literal>">
<!ENTITY t-Packaging "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>Packaging</literal>">
+<!ENTITY t-packaging "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>packaging</literal>">
<!ENTITY t-pdf "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>pdf</literal>">
<!ENTITY t-pdflatex "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>pdflatex</literal>">
<!ENTITY t-pdftex "<literal xmlns='http://www.scons.org/dbxsd/v1.0'>pdftex</literal>">
@@ -186,8 +186,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT.
<!ENTITY t-link-mwcc "<link linkend='t-mwcc' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>mwcc</literal></link>">
<!ENTITY t-link-mwld "<link linkend='t-mwld' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>mwld</literal></link>">
<!ENTITY t-link-nasm "<link linkend='t-nasm' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>nasm</literal></link>">
-<!ENTITY t-link-packaging "<link linkend='t-packaging' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>packaging</literal></link>">
<!ENTITY t-link-Packaging "<link linkend='t-Packaging' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>Packaging</literal></link>">
+<!ENTITY t-link-packaging "<link linkend='t-packaging' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>packaging</literal></link>">
<!ENTITY t-link-pdf "<link linkend='t-pdf' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>pdf</literal></link>">
<!ENTITY t-link-pdflatex "<link linkend='t-pdflatex' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>pdflatex</literal></link>">
<!ENTITY t-link-pdftex "<link linkend='t-pdftex' xmlns='http://www.scons.org/dbxsd/v1.0'><literal>pdftex</literal></link>">
diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen
index 5bf39b8..ab70d73 100644
--- a/doc/generated/variables.gen
+++ b/doc/generated/variables.gen
@@ -2780,15 +2780,6 @@ is <quote><literal>-dNOPAUSE -dBATCH -sDEVICE=pdfwrite</literal></quote>
<term>HOST_ARCH</term>
<listitem>
<para xmlns="http://www.scons.org/dbxsd/v1.0">
- The name of the host hardware architecture used to create the Environment.
- If a platform is specified when creating the Environment, then
- that Platform's logic will handle setting this value.
- This value is immutable, and should not be changed by the user after
- the Environment is initialized.
- Currently only set for Win32.
-</para>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
Sets the host architecture for Visual Studio compiler. If not set,
default to the detected host architecture: note that this may depend
on the python you are using.
@@ -2804,7 +2795,16 @@ Valid values are the same as for <envar xmlns="http://www.scons.org/dbxsd/v1.0">
This is currently only used on Windows, but in the future it will be
used on other OSes as well.
</para>
-</listitem>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+ The name of the host hardware architecture used to create the Environment.
+ If a platform is specified when creating the Environment, then
+ that Platform's logic will handle setting this value.
+ This value is immutable, and should not be changed by the user after
+ the Environment is initialized.
+ Currently only set for Win32.
+</para>
+ </listitem>
</varlistentry>
<varlistentry id="cv-HOST_OS">
<term>HOST_OS</term>
@@ -6434,6 +6434,16 @@ Example <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION">
</para>
</listitem>
</varlistentry>
+ <varlistentry id="cv-SHLIBVERSIONFLAGS">
+ <term>SHLIBVERSIONFLAGS</term>
+ <listitem>
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+Extra flags added to <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLINKCOM"><envar>$SHLINKCOM</envar></link> when building versioned
+<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-SharedLibrary"><function>SharedLibrary</function></link>. These flags are only used when <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> is
+set.
+</para>
+</listitem>
+ </varlistentry>
<varlistentry id="cv-_SHLIBVERSIONFLAGS">
<term>_SHLIBVERSIONFLAGS</term>
<listitem>
@@ -6447,16 +6457,6 @@ and some extra dynamically generated options (such as
</para>
</listitem>
</varlistentry>
- <varlistentry id="cv-SHLIBVERSIONFLAGS">
- <term>SHLIBVERSIONFLAGS</term>
- <listitem>
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
-Extra flags added to <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLINKCOM"><envar>$SHLINKCOM</envar></link> when building versioned
-<link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="b-SharedLibrary"><function>SharedLibrary</function></link>. These flags are only used when <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> is
-set.
-</para>
-</listitem>
- </varlistentry>
<varlistentry id="cv-SHLINK">
<term>SHLINK</term>
<listitem>
@@ -6919,13 +6919,6 @@ that may not be set or used in a construction environment.
<term>TARGET_ARCH</term>
<listitem>
<para xmlns="http://www.scons.org/dbxsd/v1.0">
- The name of the target hardware architecture for the compiled objects
- created by this Environment.
- This defaults to the value of HOST_ARCH, and the user can override it.
- Currently only set for Win32.
-</para>
-
-<para xmlns="http://www.scons.org/dbxsd/v1.0">
Sets the target architecture for Visual Studio compiler (i.e. the arch
of the binaries generated by the compiler). If not set, default to
<envar xmlns="http://www.scons.org/dbxsd/v1.0">$HOST_ARCH</envar>, or, if that is unset, to the architecture of the
@@ -6950,7 +6943,14 @@ and <literal>ia64</literal> (Itanium).
For example, if you want to compile 64-bit binaries, you would set
<literal>TARGET_ARCH='x86_64'</literal> in your SCons environment.
</para>
-</listitem>
+
+<para xmlns="http://www.scons.org/dbxsd/v1.0">
+ The name of the target hardware architecture for the compiled objects
+ created by this Environment.
+ This defaults to the value of HOST_ARCH, and the user can override it.
+ Currently only set for Win32.
+</para>
+ </listitem>
</varlistentry>
<varlistentry id="cv-TARGET_OS">
<term>TARGET_OS</term>
diff --git a/doc/generated/variables.mod b/doc/generated/variables.mod
index 8710f95..319ac66 100644
--- a/doc/generated/variables.mod
+++ b/doc/generated/variables.mod
@@ -491,8 +491,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT.
<!ENTITY cv-_SHLIBSONAME "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$_SHLIBSONAME</envar>">
<!ENTITY cv-SHLIBSUFFIX "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHLIBSUFFIX</envar>">
<!ENTITY cv-SHLIBVERSION "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHLIBVERSION</envar>">
-<!ENTITY cv-_SHLIBVERSIONFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$_SHLIBVERSIONFLAGS</envar>">
<!ENTITY cv-SHLIBVERSIONFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHLIBVERSIONFLAGS</envar>">
+<!ENTITY cv-_SHLIBVERSIONFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$_SHLIBVERSIONFLAGS</envar>">
<!ENTITY cv-SHLINK "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHLINK</envar>">
<!ENTITY cv-SHLINKCOM "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHLINKCOM</envar>">
<!ENTITY cv-SHLINKCOMSTR "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$SHLINKCOMSTR</envar>">
@@ -1115,8 +1115,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT.
<!ENTITY cv-link-_SHLIBSONAME "<link linkend='cv-_SHLIBSONAME' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$_SHLIBSONAME</envar></link>">
<!ENTITY cv-link-SHLIBSUFFIX "<link linkend='cv-SHLIBSUFFIX' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHLIBSUFFIX</envar></link>">
<!ENTITY cv-link-SHLIBVERSION "<link linkend='cv-SHLIBVERSION' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHLIBVERSION</envar></link>">
-<!ENTITY cv-link-_SHLIBVERSIONFLAGS "<link linkend='cv-_SHLIBVERSIONFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$_SHLIBVERSIONFLAGS</envar></link>">
<!ENTITY cv-link-SHLIBVERSIONFLAGS "<link linkend='cv-SHLIBVERSIONFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHLIBVERSIONFLAGS</envar></link>">
+<!ENTITY cv-link-_SHLIBVERSIONFLAGS "<link linkend='cv-_SHLIBVERSIONFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$_SHLIBVERSIONFLAGS</envar></link>">
<!ENTITY cv-link-SHLINK "<link linkend='cv-SHLINK' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHLINK</envar></link>">
<!ENTITY cv-link-SHLINKCOM "<link linkend='cv-SHLINKCOM' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHLINKCOM</envar></link>">
<!ENTITY cv-link-SHLINKCOMSTR "<link linkend='cv-SHLINKCOMSTR' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$SHLINKCOMSTR</envar></link>">
diff --git a/src/Announce.txt b/src/Announce.txt
index 112d6f0..fb7d0ea 100644
--- a/src/Announce.txt
+++ b/src/Announce.txt
@@ -18,7 +18,7 @@ So that everyone using SCons can help each other learn how to use it more
effectively, please go to http://scons.org/lists.html#users to sign up for
the scons-users mailing list.
-RELEASE 3.0.0.alpha.20170614 - Mon, 14 Jun 2017 12:23:56 -0400
+RELEASE 3.0.0.alpha.20170821 - Mon, 21 Aug 2017 16:15:02 -0700
Please consult the RELEASE.txt file for a summary of changes since the last
release and consult the CHANGES.txt file for complete a list of changes
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index c2c8ca8..2f04031 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -5,7 +5,7 @@
Change Log
-RELEASE 3.0.0.alpha.20170614 - Mon, 14 Jun 2017 12:23:56 -0400
+RELEASE 3.0.0.alpha.20170821 - Mon, 21 Aug 2017 16:15:02 -0700
NOTE: This is a major release. You should expect that some targets may rebuild when upgrading.
Significant changes in some python action signatures. Also switching between PY 2 and PY 3.5, 3.6
@@ -81,7 +81,7 @@ may cause rebuilds. In no case should rebuilds not happen.
https://github.com/Microsoft/vswhere
From Paweł Tomulik:
- - Fixed the issue with LDMODULEVERSIONFLAGS reported by Tim Jennes
+ - Fixed the issue with LDMODULEVERSIONFLAGS reported by Tim Jenness
(https://pairlist4.pair.net/pipermail/scons-users/2016-May/004893.html).
An error was causing "-Wl,Bsymbolic" being added to linker's command-line
even when there was no specified value in LDMODULEVERSION and thus no
diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index b08b3f7..bbc1e42 100644
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -1,4 +1,4 @@
- A new SCons checkpoint release, 3.0.0.alpha.20170614, is now available
+ A new SCons checkpoint release, 3.0.0.alpha.20170821, is now available
on the SCons download page:
http://www.scons.org/download.php
diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index 8c1161d..c31ac6c 100644
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -2654,9 +2654,12 @@ class File(Base):
if contents[:len(codecs.BOM_UTF16_BE)] == codecs.BOM_UTF16_BE:
return contents[len(codecs.BOM_UTF16_BE):].decode('utf-16-be')
try:
- return contents.decode()
- except (UnicodeDecodeError, AttributeError) as e:
- return contents
+ return contents.decode('utf-8')
+ except UnicodeDecodeError as e:
+ try:
+ return contents.decode('latin-1')
+ except UnicodeDecodeError as e:
+ return contents.decode('utf-8', error='backslashreplace')
def get_content_hash(self):
diff --git a/src/engine/SCons/Node/FSTests.py b/src/engine/SCons/Node/FSTests.py
index 399ac06..273f809 100644
--- a/src/engine/SCons/Node/FSTests.py
+++ b/src/engine/SCons/Node/FSTests.py
@@ -1315,6 +1315,14 @@ class FSTestCase(_tempdirTestCase):
assert eval('f1.get_text_contents() == u"Foo\x1aBar"'), \
f1.get_text_contents()
+ # Check for string which doesn't have BOM and isn't valid
+ # ASCII
+ test_string = b'Gan\xdfauge'
+ test.write('latin1_file', test_string)
+ f1 = fs.File(test.workpath("latin1_file"))
+ assert f1.get_text_contents() == test_string.decode('latin-1'), \
+ f1.get_text_contents()
+
def nonexistent(method, s):
try:
x = method(s, create = 0)
diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py
index 0409d3b..e186752 100644
--- a/src/engine/SCons/Node/__init__.py
+++ b/src/engine/SCons/Node/__init__.py
@@ -211,7 +211,7 @@ def get_contents_dir(node):
def get_contents_file(node):
if not node.rexists():
- return ''
+ return b''
fname = node.rfile().get_abspath()
try:
with open(fname, "rb") as fp:
diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py
index 7c9eab5..53bd397 100644
--- a/src/engine/SCons/Tool/MSCommon/vc.py
+++ b/src/engine/SCons/Tool/MSCommon/vc.py
@@ -245,7 +245,9 @@ def find_vc_pdir_vswhere(msvc_version):
if os.path.exists(vswhere_path):
sp = subprocess.Popen(vswhere_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
vsdir, err = sp.communicate()
- vc_pdir = os.path.join(vsdir.rstrip(), 'VC')
+ vsdir = vsdir.decode("mbcs")
+ vsdir = vsdir.rstrip()
+ vc_pdir = os.path.join(vsdir, 'VC')
return vc_pdir
else:
# No vswhere on system, no install info available
diff --git a/src/engine/SCons/Tool/qt.py b/src/engine/SCons/Tool/qt.py
index 5f99054..77269a8 100644
--- a/src/engine/SCons/Tool/qt.py
+++ b/src/engine/SCons/Tool/qt.py
@@ -144,6 +144,8 @@ class _Automoc(object):
# c or fortran source
continue
#cpp_contents = comment.sub('', cpp.get_text_contents())
+ if debug:
+ print("scons: qt: Getting contents of %s" % cpp)
cpp_contents = cpp.get_text_contents()
h=None
for h_ext in header_extensions:
diff --git a/src/setup.cfg b/src/setup.cfg
index f04ca1b..bda7571 100644
--- a/src/setup.cfg
+++ b/src/setup.cfg
@@ -3,3 +3,6 @@ group = Development/Tools
[bdist_wininst]
title = SCons - a software construction tool
+
+[bdist_wheel]
+universal=1