diff options
author | Thomas Nagy <tnagy@waf.io> | 2015-11-05 19:00:18 +0100 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2015-11-06 10:37:24 +0100 |
commit | f3033a1943462f98e994f095ed5805be27acadd0 (patch) | |
tree | 21481bfdd868c6696bf4c5f15fadea18d6262bd2 /buildtools | |
parent | 7c5a92a1043d5990d415014f081c8cd560fd3caa (diff) | |
download | samba-f3033a1943462f98e994f095ed5805be27acadd0.tar.gz |
build:wafsamba: Remove the print_commands code from the build scripts
Using the print_commands tool makes it easier to upgrade to Waf 1.8.
Signed-off-by: Thomas Nagy <tnagy@waf.io>
Reviewed-by: Uri Simchoni uri@samba.org
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'buildtools')
-rw-r--r-- | buildtools/wafsamba/samba_utils.py | 21 | ||||
-rwxr-xr-x | buildtools/wafsamba/wscript | 1 |
2 files changed, 1 insertions, 21 deletions
diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py index fbe89f06f02..49a87597a9f 100644 --- a/buildtools/wafsamba/samba_utils.py +++ b/buildtools/wafsamba/samba_utils.py @@ -119,27 +119,6 @@ def dict_concat(d1, d2): if t not in d1: d1[t] = d2[t] - -def exec_command(self, cmd, **kw): - '''this overrides the 'waf -v' debug output to be in a nice - unix like format instead of a python list. - Thanks to ita on #waf for this''' - _cmd = cmd - if isinstance(cmd, list): - _cmd = ' '.join(cmd) - debug('runner: %s' % _cmd) - if self.log: - self.log.write('%s\n' % cmd) - kw['log'] = self.log - try: - if not kw.get('cwd', None): - kw['cwd'] = self.cwd - except AttributeError: - self.cwd = kw['cwd'] = self.bldnode.abspath() - return Utils.exec_command(cmd, **kw) -Build.BuildContext.exec_command = exec_command - - def ADD_COMMAND(opt, name, function): '''add a new top level command to waf''' Utils.g_module.__dict__[name] = function diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript index 6df3c57fa35..a4cb620babc 100755 --- a/buildtools/wafsamba/wscript +++ b/buildtools/wafsamba/wscript @@ -216,6 +216,7 @@ def configure(conf): # load our local waf extensions conf.check_tool('gnu_dirs') conf.check_tool('wafsamba') + conf.check_tool('print_commands') conf.CHECK_CC_ENV() |