[Asterisk-code-review] Makefile: Disable XML doc validation (asterisk[18])

Friendly Automation asteriskteam at digium.com
Tue Mar 29 11:45:42 CDT 2022


Friendly Automation has submitted this change. ( https://gerrit.asterisk.org/c/asterisk/+/18275 )

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(-)

Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  Kevin Harwell: Looks good to me, approved
  Friendly Automation: Approved for Submit



diff --git a/Makefile b/Makefile
index a248554..37ed83e 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/+/18275
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 18
Gerrit-Change-Id: Idc6c44114e7dd3fadae183a4e22f4fdba0b8a645
Gerrit-Change-Number: 18275
Gerrit-PatchSet: 2
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: Joshua Colp <jcolp at sangoma.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20220329/f833747c/attachment-0001.html>


More information about the asterisk-code-review mailing list