run the xinclude first, then validate document

This commit is contained in:
Martin A. Brown 2016-03-04 11:46:17 -08:00
parent efebc78a63
commit 2a0e383c26
1 changed files with 8 additions and 8 deletions

View File

@ -72,14 +72,6 @@ class Docbook5XML(BaseDoctype, SignatureChecker):
return True
@depends(graph, chdir_output)
def validate_source(self):
'''consider lxml.etree and other validators'''
s = '''"{config.docbook5xml_jing}" \\
"{config.docbook5xml_rngfile}" \\
"{source.filename}"'''
return self.shellscript(s)
@depends(graph, validate_source)
def make_xincluded_source(self):
s = '''"{config.docbook5xml_xmllint}" > "{output.validsource}" \\
--nonet \\
@ -88,6 +80,14 @@ class Docbook5XML(BaseDoctype, SignatureChecker):
"{source.filename}"'''
return self.shellscript(s)
@depends(graph, make_xincluded_source)
def validate_source(self):
'''consider lxml.etree and other validators'''
s = '''"{config.docbook5xml_jing}" \\
"{config.docbook5xml_rngfile}" \\
"{output.validsource}"'''
return self.shellscript(s)
@depends(graph, make_xincluded_source)
def copy_static_resources(self):
source = list()