aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorLars Thorsen <[email protected]>2015-12-04 12:56:09 +0100
committerLars Thorsen <[email protected]>2015-12-04 12:56:09 +0100
commitf86828fead59ba0a28658d3f5e7d8dc80f1c73fb (patch)
tree234beceeb9dbb3dae9750703f02bd0450d192d53 /make
parent7a13283ac6f4a7738dbe2a2ccfce392a820dca2a (diff)
parent03dfbda168896807c75bd396262a3de060a91b13 (diff)
downloadotp-f86828fead59ba0a28658d3f5e7d8dc80f1c73fb.tar.gz
otp-f86828fead59ba0a28658d3f5e7d8dc80f1c73fb.tar.bz2
otp-f86828fead59ba0a28658d3f5e7d8dc80f1c73fb.zip
Merge branch 'lars/xmllint-incorrect-errors/OTP-13026' into maint
* lars/xmllint-incorrect-errors/OTP-13026: [erl_docgen] Allow br in the tag of tagged lists [erl_docgen] Add conversion of the i tag in the XSL specs [erl_docgen] Correct DTD for tags anno, fsummary and add an tag i (italic). [erl_docgen] Correct faults in the dtd Change xmllint target [erl_docgen] Update DTD for anno tag
Diffstat (limited to 'make')
-rw-r--r--make/otp_release_targets.mk11
1 files changed, 10 insertions, 1 deletions
diff --git a/make/otp_release_targets.mk b/make/otp_release_targets.mk
index 97e9e4bb43..e104b68991 100644
--- a/make/otp_release_targets.mk
+++ b/make/otp_release_targets.mk
@@ -113,7 +113,16 @@ $(HTMLDIR)/$(APPLICATION).eix: $(XML_FILES) $(SPECS_FILES)
docs: $(HTMLDIR)/$(APPLICATION).eix
xmllint: $(XML_FILES)
- $(XMLLINT) --noout --valid --nodefdtd --loaddtd --path $(DOCGEN)/priv/dtd:$(DOCGEN)/priv/dtd_html_entities $(XML_FILES)
+ @echo "Running xmllint"
+ @BookFiles=`awk -F\" '/xi:include/ {print $$2}' book.xml`; \
+ for i in $$BookFiles; do \
+ if [ $$i = "notes.xml" ]; then \
+ echo Checking $$i; \
+ xmllint --noout --valid --nodefdtd --loaddtd --path $(DOCGEN)/priv/dtd:$(DOCGEN)/priv/dtd_html_entities $$i; \
+ else\
+ awk -F\" '/xi:include/ {print "echo Checking " $$2 ;print "xmllint --noout --valid --nodefdtd --loaddtd --path $(DOCGEN)/priv/dtd:$(DOCGEN)/priv/dtd_html_entities " $$2}' $$i |sh; \
+ fi \
+ done
# ----------------------------------------------------
# Local documentation target for testing