From 487961ace6e9ac65c92d55c592b480fcc56a4b4f Mon Sep 17 00:00:00 2001 From: "David B. Kinder" Date: Fri, 1 Apr 2022 16:23:11 -0700 Subject: [PATCH] doc: fix Makefile to report errors if exception raised We use a post-processor to scan the output log from Sphinx to remove known errors and warnings before deciding if the Sphinx build was successful. If an exception happened during the Sphinx build, (see about the error would appear. Update the Makefile to not stop on errors for the Sphinx build. The post-processor will stop the make by returning an error code if it finds unexpected errors in the log. Tracked-On: #7249 Signed-off-by: David B. Kinder --- doc/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 7f48b6562..e254c6a6f 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -60,16 +60,16 @@ content: html: content doxy @echo making HTML content $(Q)./scripts/show-versions.py - $(Q)$(SPHINXBUILD) -t $(DOC_TAG) -b html -d $(BUILDDIR)/doctrees $(SOURCEDIR) $(BUILDDIR)/html $(SPHINXOPTS) $(OPTS) >> $(BUILDDIR)/doc.log 2>&1 + -$(Q)$(SPHINXBUILD) -t $(DOC_TAG) -b html -d $(BUILDDIR)/doctrees $(SOURCEDIR) $(BUILDDIR)/html $(SPHINXOPTS) $(OPTS) >> $(BUILDDIR)/doc.log 2>&1 $(Q)./scripts/filter-doc-log.sh $(BUILDDIR)/doc.log singlehtml: content doxy - $(Q)$(SPHINXBUILD) -t $(DOC_TAG) -b singlehtml -d $(BUILDDIR)/doctrees $(SOURCEDIR) $(BUILDDIR)/html $(SPHINXOPTS) $(OPTS) >> $(BUILDDIR)/doc.log 2>&1 + -$(Q)$(SPHINXBUILD) -t $(DOC_TAG) -b singlehtml -d $(BUILDDIR)/doctrees $(SOURCEDIR) $(BUILDDIR)/html $(SPHINXOPTS) $(OPTS) >> $(BUILDDIR)/doc.log 2>&1 $(Q)./scripts/filter-doc-log.sh $(BUILDDIR)/doc.log pdf: html @echo now making $(BUILDDIR)/latex/acrn.pdf - $(Q)make -silent latexpdf LATEXMKOPTS=$(LATEXMKOPTS) >> $(BUILDDIR)/doc.log 2>&1 + -$(Q)make -silent latexpdf LATEXMKOPTS=$(LATEXMKOPTS) >> $(BUILDDIR)/doc.log 2>&1 $(Q)./scripts/filter-doc-log.sh $(BUILDDIR)/doc.log