summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2017-08-19 21:50:43 -0700
committerWilliam Deegan <bill@baddogconsulting.com>2017-08-19 21:50:43 -0700
commitcde8b8346894ef1e6ef6c254bc79a3f5f3a2e580 (patch)
tree7b5b1cbf60ed8dca598863dca48b35231fd7984d
parent88d205705546d6147083440aa6e368387fa21fb5 (diff)
downloadscons-cde8b8346894ef1e6ef6c254bc79a3f5f3a2e580.tar.gz
Fix Bug #2486 - Allow SetOption('silent',True) - Previously this option could not be passed to SetOption
-rw-r--r--doc/generated/functions.gen8
-rw-r--r--doc/generated/variables.gen4
-rw-r--r--src/engine/SCons/Script/Main.xml8
3 files changed, 18 insertions, 2 deletions
diff --git a/doc/generated/functions.gen b/doc/generated/functions.gen
index e72740a2..79a83c62 100644
--- a/doc/generated/functions.gen
+++ b/doc/generated/functions.gen
@@ -3998,6 +3998,14 @@ which corresponds to --random; and
</listitem>
</varlistentry>
<varlistentry>
+<term><literal>silent</literal></term>
+<listitem>
+<para>
+which corresponds to --silent.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
<term><literal>stack_size</literal></term>
<listitem>
<para>
diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen
index 0ad4c96d..5bf39b84 100644
--- a/doc/generated/variables.gen
+++ b/doc/generated/variables.gen
@@ -3046,7 +3046,7 @@ The command line used to call the Java archive tool.
<para xmlns="http://www.scons.org/dbxsd/v1.0">
The string displayed when the Java archive tool
is called
-If this is not set, then <envar xmlns="http://www.scons.org/dbxsd/v1.0">$JARCOM</envar> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-JARCOM"><envar>$JARCOM</envar></link> (the command line) is displayed.
</para>
<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
@@ -3056,7 +3056,7 @@ env = Environment(JARCOMSTR = "JARchiving $SOURCES into $TARGET")
<para xmlns="http://www.scons.org/dbxsd/v1.0">
The string displayed when the Java archive tool
is called
-If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-JARCOM"><envar>$JARCOM</envar></link> (the command line) is displayed.
+If this is not set, then <envar xmlns="http://www.scons.org/dbxsd/v1.0">$JARCOM</envar> (the command line) is displayed.
</para>
<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
diff --git a/src/engine/SCons/Script/Main.xml b/src/engine/SCons/Script/Main.xml
index 98db5bf3..e95afbca 100644
--- a/src/engine/SCons/Script/Main.xml
+++ b/src/engine/SCons/Script/Main.xml
@@ -781,6 +781,14 @@ which corresponds to --random; and
</listitem>
</varlistentry>
<varlistentry>
+<term><literal>silent</literal></term>
+<listitem>
+<para>
+which corresponds to --silent.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
<term><literal>stack_size</literal></term>
<listitem>
<para>