From: George Joseph Date: Fri, 25 Mar 2022 19:00:48 +0000 (-0600) Subject: Makefile: Disable XML doc validation X-Git-Tag: 16.26.0-rc1~39 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a7e01b8ae0a8e01a85044b1dae9a90be2e1fdc6;p=thirdparty%2Fasterisk.git 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 --- diff --git a/Makefile b/Makefile index 3ff586900b..858aaa3ec8 100644 --- a/Makefile +++ b/Makefile @@ -485,7 +485,7 @@ XML_core_en_US := $(shell build_tools/make_xml_documentation --command=print_dep # 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. @@ -497,7 +497,7 @@ ifeq ($(PYTHON),:) @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