summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2004-03-24 14:08:12 (GMT)
committerSteven Knight <knight@baldmt.com>2004-03-24 14:08:12 (GMT)
commit5b3b7a9401f4dd9397cd753740cda263b0fa7d61 (patch)
treef9ba9732a71db861046c6526c0f4261999c6cd54 /src
parentbd136c4b1fe44da061910372d80b79c86a31d4e3 (diff)
downloadSCons-5b3b7a9401f4dd9397cd753740cda263b0fa7d61.zip
SCons-5b3b7a9401f4dd9397cd753740cda263b0fa7d61.tar.gz
SCons-5b3b7a9401f4dd9397cd753740cda263b0fa7d61.tar.bz2
Add --debug=presub to the help text.
Diffstat (limited to 'src')
-rw-r--r--src/CHANGES.txt4
-rw-r--r--src/engine/SCons/Script/__init__.py10
2 files changed, 10 insertions, 4 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 8eef6a7..c421d12 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -27,6 +27,10 @@ RELEASE 0.96 - XXX
- Fix use of $MSVS_IGNORE_IDE_PATHS, which was broken when we added
support for $MSVS_USE_MFC_DIRS last release.
+ From Gary Oberbrunner:
+
+ - Add a --debug=presub option to print actions prior to substitution.
+
RELEASE 0.95 - Mon, 08 Mar 2004 06:43:20 -0600
diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py
index c59ce69..52d0db2 100644
--- a/src/engine/SCons/Script/__init__.py
+++ b/src/engine/SCons/Script/__init__.py
@@ -493,9 +493,11 @@ class OptParser(OptionParser):
help="Search up directory tree for SConstruct, "
"build all Default() targets.")
- def opt_debug(option, opt, value, parser):
- if value in ["count", "dtree", "includes", "memory", "objects",
- "pdb", "presub", "time", "tree"]:
+ debug_options = ["count", "dtree", "includes", "memory", "objects",
+ "pdb", "presub", "time", "tree"]
+
+ def opt_debug(option, opt, value, parser, debug_options=debug_options):
+ if value in debug_options:
setattr(parser.values, 'debug', value)
else:
raise OptionValueError("Warning: %s is not a valid debug type" % value)
@@ -503,7 +505,7 @@ class OptParser(OptionParser):
callback=opt_debug, nargs=1, dest="debug",
metavar="TYPE",
help="Print various types of debugging information: "
- "count, dtree, includes, memory, objects, pdb, time, tree.")
+ "%s." % string.join(debug_options, ", "))
self.add_option('-f', '--file', '--makefile', '--sconstruct',
action="append", nargs=1,