diff options
author | Alexander Bokovoy <ab@samba.org> | 2018-01-31 11:48:43 +0200 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2018-09-05 06:37:22 +0200 |
commit | 4e65b33c1d40bb2c243f775f388056aed31d8671 (patch) | |
tree | 5a41b6ddef7ce1c0b6a93bcc16ef89da10f080e8 /third_party/waf/waflib/extras/doxygen.py | |
parent | faef27506977db01cc4619140a71652463914378 (diff) | |
download | samba-4e65b33c1d40bb2c243f775f388056aed31d8671.tar.gz |
third_party:waf: update to upstream 2.0.4 release
Update third_party/waf/ to 2.0.4 to bring us closer to Python 3
This change requires a number of changes in buildtools/ too.
Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'third_party/waf/waflib/extras/doxygen.py')
-rw-r--r-- | third_party/waf/waflib/extras/doxygen.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/third_party/waf/waflib/extras/doxygen.py b/third_party/waf/waflib/extras/doxygen.py index 9e17595f89a..f6e951b8f32 100644 --- a/third_party/waf/waflib/extras/doxygen.py +++ b/third_party/waf/waflib/extras/doxygen.py @@ -1,4 +1,8 @@ #! /usr/bin/env python +# encoding: utf-8 +# WARNING! Do not edit! https://waf.io/book/index.html#_obtaining_the_waf_file + +#! /usr/bin/env python # encoding: UTF-8 # Thomas Nagy 2008-2010 (ita) @@ -119,9 +123,10 @@ class doxygen(Task.Task): def scan(self): exclude_patterns = self.pars.get('EXCLUDE_PATTERNS','').split() + exclude_patterns = [pattern.replace('*/', '**/') for pattern in exclude_patterns] file_patterns = self.pars.get('FILE_PATTERNS','').split() if not file_patterns: - file_patterns = DOXY_FILE_PATTERNS + file_patterns = DOXY_FILE_PATTERNS.split() if self.pars.get('RECURSIVE') == 'YES': file_patterns = ["**/%s" % pattern for pattern in file_patterns] nodes = [] @@ -148,7 +153,7 @@ class doxygen(Task.Task): def post_run(self): nodes = self.output_dir.ant_glob('**/*', quiet=True) for x in nodes: - x.sig = Utils.h_file(x.abspath()) + self.generator.bld.node_sigs[x] = self.uid() self.add_install() return Task.Task.post_run(self) @@ -157,8 +162,8 @@ class doxygen(Task.Task): self.outputs += nodes if getattr(self.generator, 'install_path', None): if not getattr(self.generator, 'doxy_tar', None): - self.generator.bld.install_files(self.generator.install_path, - self.outputs, + self.generator.add_install_files(install_to=self.generator.install_path, + install_from=self.outputs, postpone=False, cwd=self.output_dir, relative_trick=True) @@ -211,7 +216,7 @@ def process_doxy(self): else: tsk.env['TAROPTS'] = ['cf'] if getattr(self, 'install_path', None): - self.bld.install_files(self.install_path, tsk.outputs) + self.add_install_files(install_to=self.install_path, install_from=tsk.outputs) def configure(conf): ''' |