waf: upgrade to 2.0.18

[samba.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 423d8455025c42a9856d09b0fbc044dffac7215e..20cd9e1a8522b639461a63214d0e2a2ab734dca4 100644 (file)
--- a/third_party/waf/waflib/extras/doxygen.py
+++ b/third_party/waf/waflib/extras/doxygen.py
@@ -85,6 +85,12 @@ class doxygen(Task.Task):
                if not getattr(self, 'pars', None):
                        txt = self.inputs[0].read()
                        self.pars = parse_doxy(txt)
+
+                       # Override with any parameters passed to the task generator
+                       if getattr(self.generator, 'pars', None):
+                               for k, v in self.generator.pars.items():
+                                       self.pars[k] = v
+
                        if self.pars.get('OUTPUT_DIRECTORY'):
                                # Use the path parsed from the Doxyfile as an absolute path
                                output_node = self.inputs[0].parent.get_bld().make_node(self.pars['OUTPUT_DIRECTORY'])
@@ -94,11 +100,6 @@ class doxygen(Task.Task):
                        output_node.mkdir()
                        self.pars['OUTPUT_DIRECTORY'] = output_node.abspath()
 
-                       # Override with any parameters passed to the task generator
-                       if getattr(self.generator, 'pars', None):
-                               for k, v in self.generator.pars.items():
-                                       self.pars[k] = v
-
                        self.doxy_inputs = getattr(self, 'doxy_inputs', [])
                        if not self.pars.get('INPUT'):
                                self.doxy_inputs.append(self.inputs[0].parent)