From 24c01cf9aed9633ac92f17c9243b4cf65daf9dd6 Mon Sep 17 00:00:00 2001
From: StenGruener <69786685+StenGruener@users.noreply.github.com>
Date: Sat, 28 Oct 2023 19:46:50 +0000
Subject: adding info to the man page, changed debug key

---
 CHANGES.txt                        | 2 +-
 SCons/Script/Main.py               | 2 +-
 SCons/Script/SConsOptions.py       | 2 +-
 doc/man/scons.xml                  | 6 ++++++
 test/SConscript/SConscriptTrace.py | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index c362989..08d4dd3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,7 +9,7 @@ NOTE: 4.3.0 now requires Python 3.6.0 and above. Python 3.5.x is no longer suppo
 
 RELEASE  VERSION/DATE TO BE FILLED IN LATER
   From Sten Grüner
-    - The --debug flag has a 'sconscript-trace' option allowint to trace
+    - The --debug flag has a 'sconscript' option allowint to trace
       files included via SConscript call.
 
   From Max Bachmann:
diff --git a/SCons/Script/Main.py b/SCons/Script/Main.py
index d218803..c29fb38 100644
--- a/SCons/Script/Main.py
+++ b/SCons/Script/Main.py
@@ -725,7 +725,7 @@ def _set_debug_values(options) -> None:
         SCons.Node.print_duplicate = True
     if "json" in debug_values:
         ENABLE_JSON = True
-    if "sconscript-trace" in debug_values:
+    if "sconscript" in debug_values:
         SCons.Debug.sconscript_trace = True
 
 def _create_path(plist):
diff --git a/SCons/Script/SConsOptions.py b/SCons/Script/SConsOptions.py
index 1d40f5c..b74353e 100644
--- a/SCons/Script/SConsOptions.py
+++ b/SCons/Script/SConsOptions.py
@@ -752,7 +752,7 @@ def Parser(version):
     debug_options = ["count", "duplicate", "explain", "findlibs",
                      "includes", "memoizer", "memory", "objects",
                      "pdb", "prepare", "presub", "stacktrace",
-                     "time", "action-timestamps", "json", "sconscript-trace"]
+                     "time", "action-timestamps", "json", "sconscript"]
 
     def opt_debug(option, opt, value__, parser,
                   debug_options=debug_options,
diff --git a/doc/man/scons.xml b/doc/man/scons.xml
index 6a888cb..d9406d7 100644
--- a/doc/man/scons.xml
+++ b/doc/man/scons.xml
@@ -1119,6 +1119,12 @@ should take place in parallel.)
 </para>
   </listitem>
   </varlistentry>
+  <varlistentry>
+  <term><emphasis role="bold">sconscript</emphasis></term>
+  <listitem>
+<para>Augments the output of SCons with markers to track included SConscript files.</para>
+  </listitem>
+  </varlistentry>
   </variablelist> <!-- end nested list -->
   </listitem>
   </varlistentry>
diff --git a/test/SConscript/SConscriptTrace.py b/test/SConscript/SConscriptTrace.py
index c432362..ab1b660 100644
--- a/test/SConscript/SConscriptTrace.py
+++ b/test/SConscript/SConscriptTrace.py
@@ -43,7 +43,7 @@ unexpect = [
 ]
 test.must_not_contain_any_line(test.stdout(), unexpect)
 
-test.run(arguments = "--debug=sconscript-trace .")
+test.run(arguments = "--debug=sconscript .")
 expect = [
     'scons-entering>%s%sSConstruct'%(wpath, os.sep),
     'scons-exiting>%s%sSConstruct'%(wpath, os.sep)
-- 
cgit v0.12