[Asterisk-code-review] Makefile: Disable XML doc validation (asterisk[16.25])
Kevin Harwell
asteriskteam at digium.com
Mon Mar 28 13:18:16 CDT 2022
Kevin Harwell has uploaded this change for review. ( https://gerrit.asterisk.org/c/asterisk/+/18287 )
Change subject: Makefile: Disable XML doc validation
......................................................................
Makefile: Disable XML doc validation
make_xml_documentation was being called with the --validate
flag set when it shouldn't have been. This was causing
build failures if neither xmllint nor xmlstarlet were installed.
The correct behavior is to simply print a message that either
one of those tools should be installed for validation and
continue with the build.
ASTERISK-29988
Change-Id: Idc6c44114e7dd3fadae183a4e22f4fdba0b8a645
---
M Makefile
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/87/18287/1
diff --git a/Makefile b/Makefile
index 539aee2..22d5903 100644
--- a/Makefile
+++ b/Makefile
@@ -480,7 +480,7 @@
# core-en_US.xml is the normal documentation created with asterisk builds.
doc/core-en_US.xml: makeopts .lastclean $(XML_core_en_US)
@build_tools/make_xml_documentation --command=create_xml --source-tree=. --mod-subdirs="$(DOC_MOD_SUBDIRS)" \
- --with-moduleinfo --validate --output-file=$@
+ --with-moduleinfo --output-file=$@
# The full-en_US.xml target is only called by the wiki documentation generation process
# and does special post-processing in preparation for uploading to the wiki.
@@ -492,7 +492,7 @@
@echo "--------------------------------------------------------------------------"
else
@build_tools/make_xml_documentation --command=create_xml --source-tree=. --mod-subdirs="$(DOC_MOD_SUBDIRS)" \
- --for-wiki --validate --output-file=$@ --core-output-file=./doc/core-en_US.xml
+ --for-wiki --output-file=$@ --core-output-file=./doc/core-en_US.xml
endif
validate-docs: doc/core-en_US.xml
--
To view, visit https://gerrit.asterisk.org/c/asterisk/+/18287
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings
Gerrit-Project: asterisk
Gerrit-Branch: 16.25
Gerrit-Change-Id: Idc6c44114e7dd3fadae183a4e22f4fdba0b8a645
Gerrit-Change-Number: 18287
Gerrit-PatchSet: 1
Gerrit-Owner: Kevin Harwell <kharwell at digium.com>
Gerrit-CC: George Joseph <gjoseph at digium.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20220328/8a04ba5d/attachment-0001.html>
More information about the asterisk-code-review
mailing list