diff options
| author | Tom Tanner <ttanner2@bloomberg.net> | 2013-10-30 12:34:15 (GMT) |
|---|---|---|
| committer | Tom Tanner <ttanner2@bloomberg.net> | 2013-10-30 12:34:15 (GMT) |
| commit | 54eaf41e5eadd05c73b0ad21223f73c4ed47684f (patch) | |
| tree | 368ae3aa60375a38c6d2d967548f0bd16a0ab4e5 /src/engine/SCons/Script/Main.py | |
| parent | d5870b7149bcb4058c21288827a5c79f2f12ccdb (diff) | |
| parent | e38f59cab5d40f09f15c5e65645aa2d8af165c66 (diff) | |
| download | SCons-54eaf41e5eadd05c73b0ad21223f73c4ed47684f.zip SCons-54eaf41e5eadd05c73b0ad21223f73c4ed47684f.tar.gz SCons-54eaf41e5eadd05c73b0ad21223f73c4ed47684f.tar.bz2 | |
Merged scons/scons into default
Diffstat (limited to 'src/engine/SCons/Script/Main.py')
| -rw-r--r-- | src/engine/SCons/Script/Main.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py index 191c7b5..a81ac98 100644 --- a/src/engine/SCons/Script/Main.py +++ b/src/engine/SCons/Script/Main.py @@ -622,7 +622,7 @@ def _set_debug_values(options): debug_values = options.debug if "count" in debug_values: - # All of the object counts are within "if __debug__:" blocks, + # All of the object counts are within "if track_instances:" blocks, # which get stripped when running optimized (with python -O or # from compiled *.pyo files). Provide a warning if __debug__ is # stripped, so it doesn't just look like --debug=count is broken. @@ -630,6 +630,7 @@ def _set_debug_values(options): if __debug__: enable_count = True if enable_count: count_stats.enable(sys.stdout) + SCons.Debug.track_instances = True else: msg = "--debug=count is not supported when running SCons\n" + \ "\twith the python -O option or optimized (.pyo) modules." @@ -644,6 +645,8 @@ def _set_debug_values(options): if "memory" in debug_values: memory_stats.enable(sys.stdout) print_objects = ("objects" in debug_values) + if print_objects: + SCons.Debug.track_instances = True if "presub" in debug_values: SCons.Action.print_actions_presub = 1 if "stacktrace" in debug_values: |