kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 11:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makefile: Disable XML doc validation

Browse Source 
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
This commit is contained in:
George Joseph
2022-03-25 13:00:48 -06:00
committed by Kevin Harwell
parent 6de7ad5ba1
commit 4a7e01b8ae
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -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. # core-en_US.xml is the normal documentation created with asterisk builds.
doc/core-en_US.xml: makeopts .lastclean $(XML_core_en_US) 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)" \ @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 # 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. # and does special post-processing in preparation for uploading to the wiki.
@@ -497,7 +497,7 @@ ifeq ($(PYTHON),:)
@echo "--------------------------------------------------------------------------" @echo "--------------------------------------------------------------------------"
else else
@build_tools/make_xml_documentation --command=create_xml --source-tree=. --mod-subdirs="$(DOC_MOD_SUBDIRS)" \ @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 endif
validate-docs: doc/core-en_US.xml validate-docs: doc/core-en_US.xml