From b8d2f88a67ae41992bb42822e5574468b9e8674e Mon Sep 17 00:00:00 2001 From: Kevin Putnam Date: Fri, 26 Jul 2019 15:52:17 -0700 Subject: [PATCH] Changed sphinx requirement to 1.8. Added error on warning to htmlall make rule. Signed-off-by: Kevin Putnam --- requirements.txt | 2 +- source/Makefile | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index b70fc901..29fa6ef8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ breathe==4.9.1 -sphinx==1.7.5 +sphinx==1.8 docutils==0.14 sphinx_rtd_theme sphinx-intl==2.0.0 \ No newline at end of file diff --git a/source/Makefile b/source/Makefile index 685d058a..c30a7ebb 100644 --- a/source/Makefile +++ b/source/Makefile @@ -17,6 +17,7 @@ endif PAPEROPT_a4 = -D latex_paper_size=a4 PAPEROPT_letter = -D latex_paper_size=letter ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . +ERROROPTS = -W --keep-going # the i18n builder cannot share the environment and doctrees with the others I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . @@ -54,8 +55,8 @@ clean: rm -rf $(BUILDDIR)/* htmlall: - $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html - $(SPHINXBUILD) -b html -D language='zh_CN' $(ALLSPHINXOPTS) $(BUILDDIR)/html/zh_CN + $(SPHINXBUILD) -b html $(ERROROPTS) $(ALLSPHINXOPTS) $(BUILDDIR)/html + $(SPHINXBUILD) -b html $(ERROROPTS) -D language='zh_CN' $(ALLSPHINXOPTS) $(BUILDDIR)/html/zh_CN htmlde: $(SPHINXBUILD) -b html -D language='de' $(ALLSPHINXOPTS) $(BUILDDIR)/html/de