From ab167f687db7f5b39d0c1123ae4bc2d5c282bcbc Mon Sep 17 00:00:00 2001
From: Philipp Spilger
Date: Fri, 5 Jul 2019 10:38:10 +0000
Subject: [PATCH] Fix doxygen task-gen. pars input before processing
* OUTPUT_DIRECTORY now is created for a present parameter in `pars`
of the task.
---
waflib/extras/doxygen.py | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/waflib/extras/doxygen.py b/waflib/extras/doxygen.py
index 423d8455..20cd9e1a 100644
--- a/waflib/extras/doxygen.py
+++ b/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)