From: Georg Brandl Date: Sat, 13 Mar 2010 11:03:05 +0000 (+0000) Subject: Merged revisions 78915 via svnmerge from X-Git-Tag: v3.1.2~13 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e869313e8537d74044325d5dac0c3ae4102d1725;p=python Merged revisions 78915 via svnmerge from svn+ssh://svn.python.org/python/branches/py3k ................ r78915 | georg.brandl | 2010-03-13 12:02:07 +0100 (Sa, 13 Mär 2010) | 9 lines Merged revisions 78908 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78908 | georg.brandl | 2010-03-13 11:12:39 +0100 (Sa, 13 Mär 2010) | 1 line Add Makefile targets for automatic doc build. Add script that will be used for daily build. ........ ................ --- diff --git a/Doc/Makefile b/Doc/Makefile index 77b3bacdb6..8e56855fae 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -14,19 +14,26 @@ DISTVERSION = $(shell $(PYTHON) tools/sphinxext/patchlevel.py) ALLSPHINXOPTS = -b $(BUILDER) -d build/doctrees -D latex_paper_size=$(PAPER) \ $(SPHINXOPTS) . build/$(BUILDER) $(SOURCES) -.PHONY: help checkout update build html htmlhelp clean coverage dist check +.PHONY: help checkout update build html htmlhelp latex text changes linkcheck \ + suspicious coverage doctest pydoc-topics htmlview clean dist check serve \ + autobuild-dev autobuild-stable help: @echo "Please use \`make ' where is one of" - @echo " html to make standalone HTML files" - @echo " htmlhelp to make HTML files and a HTML help project" - @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" - @echo " text to make plain text files" - @echo " changes to make an overview over all changed/added/deprecated items" - @echo " linkcheck to check all external links for integrity" + @echo " clean to remove build files" + @echo " update to update build tools" + @echo " html to make standalone HTML files" + @echo " htmlhelp to make HTML files and a HTML help project" + @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" + @echo " text to make plain text files" + @echo " changes to make an overview over all changed/added/deprecated items" + @echo " linkcheck to check all external links for integrity" + @echo " coverage to check documentation coverage for library and C API" + @echo " doctest to run doctests in the documentation" + @echo " pydoc-topics to regenerate the pydoc topics file" + @echo " dist to create a \"dist\" directory with archived docs for download" @echo " suspicious to check for suspicious markup in output text" - @echo " coverage to check documentation coverage for library and C API" - @echo " dist to create a \"dist\" directory with archived docs for download" + @echo " check to run a check for frequent markup errors" # Note: if you update versions here, do the same in make.bat and README.txt checkout: @@ -149,3 +156,17 @@ dist: check: $(PYTHON) tools/rstlint.py -i tools + +# Targets for automatic doc build + +# for development releases: always build +autobuild-dev: + make update + make dist + +# for stable releases: only build if not in development mode +autobuild-stable: + @case $(DISTVERSION) in *[abc]*) \ + echo "Not building; not a release version."; exit 1;; \ + esac + @make autobuild-dev