third_party:waf: update to upstream 2.0.4 release

[bbaumbach/samba-autobuild/.git] / third_party / waf / waflib / extras / doxygen.py

diff --git a/third_party/waf/waflib/extras/doxygen.py b/third_party/waf/waflib/extras/doxygen.py
index 9e17595f89a050f37840561dc8df8fe478351913..f6e951b8f322f35eab7d65beb6247adef23cd310 100644 (file)
--- a/third_party/waf/waflib/extras/doxygen.py
+++ b/third_party/waf/waflib/extras/doxygen.py
@@ -1,3 +1,7 @@
+#! /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):
        '''