From 49fe9157987d0d3fefb812d7af4f560566eaa42e Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Thu, 25 Jun 2015 10:12:56 -0400 Subject: [PATCH 1/2] BF: fail if docs failed to build --- docs/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Makefile b/docs/Makefile index 3a7b8c2c3..373a1ae82 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -27,7 +27,7 @@ help: build: mkdir -p build/$(BUILDER) build/doctrees - -sphinx-build $(ALLSPHINXOPTS) + sphinx-build $(ALLSPHINXOPTS) @echo From 5f3e1e9a169c6920f5d1edfb20dd77339c32d81e Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Thu, 25 Jun 2015 21:30:35 -0400 Subject: [PATCH 2/2] ENH: make explicit build-ignore-errors to be used by linkfix --- docs/Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index 373a1ae82..26b2b52b1 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -24,12 +24,17 @@ help: @echo " changes to make an overview over all changed/added/deprecated items" @echo " linkcheck to check all external links for integrity" - -build: +build-dirs: mkdir -p build/$(BUILDER) build/doctrees + +build: build-dirs sphinx-build $(ALLSPHINXOPTS) @echo +build-ignore-errors: build-dirs + -sphinx-build $(ALLSPHINXOPTS) + @echo + html: BUILDER = html html: build @@ -59,7 +64,8 @@ linkcheck: build @echo "Link check complete; look for any errors in the above output " \ "or in build/$(BUILDER)/output.txt" -linkfix: linkcheck +linkfix: BUILDER = linkcheck +linkfix: build-ignore-errors $(PYTHON) utils/linkfix.py @echo "Fixing redirecting links in docs has finished; check all " \ "replacements before committing them"