mirror of https://gitlab.com/ita1024/waf.git
Merge branch 'doxygen_order_fix' into 'master'
Fix doxygen task-gen. pars input before processing See merge request ita1024/waf!2255
This commit is contained in:
commit
a91bb8fa63
|
@ -85,6 +85,12 @@ class doxygen(Task.Task):
|
||||||
if not getattr(self, 'pars', None):
|
if not getattr(self, 'pars', None):
|
||||||
txt = self.inputs[0].read()
|
txt = self.inputs[0].read()
|
||||||
self.pars = parse_doxy(txt)
|
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'):
|
if self.pars.get('OUTPUT_DIRECTORY'):
|
||||||
# Use the path parsed from the Doxyfile as an absolute path
|
# 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'])
|
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()
|
output_node.mkdir()
|
||||||
self.pars['OUTPUT_DIRECTORY'] = output_node.abspath()
|
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', [])
|
self.doxy_inputs = getattr(self, 'doxy_inputs', [])
|
||||||
if not self.pars.get('INPUT'):
|
if not self.pars.get('INPUT'):
|
||||||
self.doxy_inputs.append(self.inputs[0].parent)
|
self.doxy_inputs.append(self.inputs[0].parent)
|
||||||
|
|
Loading…
Reference in New Issue