Skip to content

Commit

Permalink
Merge pull request kivy#5 from thopiekar/make-doc-build-failsave
Browse files Browse the repository at this point in the history
Make doc build failsave
  • Loading branch information
thopiekar committed Jan 24, 2015
2 parents b49963d + 55d8b48 commit 8c8611e
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 13 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ clean:
-rm -rf doc/build
-rm -rf build
-rm -rf htmlcov
-rm .coverage
-rm .noseids
-rm -f .coverage
-rm -f .noseids
-rm -rf kivy/tests/build
-find kivy -iname '*.so' -exec rm {} \;
-find kivy -iname '*.pyc' -exec rm {} \;
Expand Down
24 changes: 13 additions & 11 deletions doc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ ALLSPHINXOPTS = -d build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) sources
ALLSPHINXOPTS_TEST = -d build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS_TEST) sources
ALLSPHINXOPTSGT = -d build/doctrees_gettext $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) sources
ALLSPHINXOPTSGT_TEST = -d build/doctrees_gettext $(PAPEROPT_$(PAPER)) $(SPHINXOPTS_TEST) sources
LATEXOPTS = -interaction=batchmode
LATEXOPTS_TESTS =

ifeq ($(ENDUSER_BUILD),yes)
_TESTS =
Expand Down Expand Up @@ -100,9 +102,16 @@ latex:
"run these through (pdf)latex."

pdf: latex
$(MAKE) -C build$(P)latex all-pdf
rm -f build$(P)latex$(P)Kivy.pdf
-$(MAKE) -C build$(P)latex all-pdf LATEXOPTS=$(LATEXOPTS$(_TESTS))
ifneq ("$(wildcard build$(P)latex$(P)Kivy.pdf)","")
@echo
@echo "Build finished; the PDF files are in build/latex."
@echo "Build finished; the PDF file(s) are in build/latex."
else
@echo
@echo "Build failed; there is no PDF file(s) in build/latex."
exit 1
endif

ps: latex
$(MAKE) -C build$(P)latex all-ps
Expand All @@ -124,14 +133,7 @@ linkcheck:
@echo "Link check complete; look for any errors in the above output " \
"or in build/linkcheck/output.txt."

enable-ENDUSER_BUILD:
$(ENDUSER_BUILD) = yes
$(_TESTS) =

disable-ENDUSER_BUILD:
$(ENDUSER_BUILD) = no
$(_TESTS) = _TEST

build-all: html pickle htmlhelp pdf ps gettext

test: disable-ENDUSER_BUILD build-all
# TODO: Make test run in non-enduser-build mode
test: build-all

0 comments on commit 8c8611e

Please sign in to comment.