diff options
| author | David Robillard <d@drobilla.net> | 2019-03-16 22:41:27 +0100 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2019-03-17 10:42:22 +0100 |
| commit | 70d03b82d0cdc623effe1263808d7f31c84e0146 (patch) | |
| tree | f50b05c690ccfa2d1ebf42a5c3d3c775d9246848 | |
| parent | b7d689a4ca9d2c5ef2d531802a8f594cd94e3628 (diff) | |
| download | autowaf-70d03b82d0cdc623effe1263808d7f31c84e0146.tar.gz autowaf-70d03b82d0cdc623effe1263808d7f31c84e0146.tar.bz2 autowaf-70d03b82d0cdc623effe1263808d7f31c84e0146.zip | |
Avoid use of global counter hacks for configuration display
| -rw-r--r-- | extras/autowaf.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/extras/autowaf.py b/extras/autowaf.py index 4814aa8..5095720 100644 --- a/extras/autowaf.py +++ b/extras/autowaf.py @@ -107,7 +107,8 @@ class ConfigureContext(Configure.ConfigurationContext): self.system_include_paths = set() def pre_recurse(self, node): - display_header('Configuring %s' % node.parent.srcpath()) + if len(self.stack_path) == 1: + Logs.pprint('BOLD', 'Configuring %s' % node.parent.srcpath()) super(ConfigureContext, self).pre_recurse(node) def store(self): @@ -365,8 +366,7 @@ def configure(conf): conf.env.prepend_value('CXXFLAGS', '-I' + os.path.abspath('.')) def display_summary(conf, msgs=None): - global g_is_child - if not g_is_child: + if len(conf.stack_path) == 1: display_msg(conf, "Install prefix", conf.env['PREFIX']) if 'COMPILER_CC' in conf.env: display_msg(conf, "C Flags", ' '.join(conf.env['CFLAGS'])) @@ -492,11 +492,6 @@ def set_lib_env(conf, name, version): conf.run_env.append_unique(lib_path_name, lib_path) conf.define(NAME + '_VERSION', version) -def display_header(title): - global g_is_child - if g_is_child: - Logs.pprint('BOLD', title) - def display_msg(conf, msg, status=None, color=None): color = 'CYAN' if type(status) == bool and status: |