Merged revisions 66508,66510,66512-66513,66523-66526,66529-66530,66532,66535,66538,66544,66546 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66508 | benjamin.peterson | 2008-09-18 18:20:28 -0500 (Thu, 18 Sep 2008) | 1 line
tabify
........
r66510 | josiah.carlson | 2008-09-18 21:07:22 -0500 (Thu, 18 Sep 2008) | 2 lines
Fix for documentation bug. Fixes issue 3904.
........
r66512 | raymond.hettinger | 2008-09-19 03:07:48 -0500 (Fri, 19 Sep 2008) | 1 line
Improve docs for super().
........
r66513 | lars.gustaebel | 2008-09-19 07:39:23 -0500 (Fri, 19 Sep 2008) | 2 lines
Correct information about the tarfile module.
........
r66523 | georg.brandl | 2008-09-21 02:14:44 -0500 (Sun, 21 Sep 2008) | 2 lines
#3852: fix some select.kqueue and kevent docs.
........
r66524 | georg.brandl | 2008-09-21 02:15:59 -0500 (Sun, 21 Sep 2008) | 2 lines
#3912: document default for *places* arg.
........
r66525 | georg.brandl | 2008-09-21 02:17:00 -0500 (Sun, 21 Sep 2008) | 2 lines
#3916: fixes for docs wrt. Windows directory layout
........
r66526 | georg.brandl | 2008-09-21 02:18:28 -0500 (Sun, 21 Sep 2008) | 2 lines
#3914: add //= to the augmented assign operators.
........
r66529 | georg.brandl | 2008-09-21 02:24:11 -0500 (Sun, 21 Sep 2008) | 2 lines
#3901: bsddb fix.
........
r66530 | georg.brandl | 2008-09-21 02:31:52 -0500 (Sun, 21 Sep 2008) | 2 lines
#3897: _collections now has an underscore.
........
r66532 | georg.brandl | 2008-09-21 02:36:22 -0500 (Sun, 21 Sep 2008) | 2 lines
Update readme and Makefile (web builder doesn't exist).
........
r66535 | georg.brandl | 2008-09-21 03:03:21 -0500 (Sun, 21 Sep 2008) | 2 lines
#3918: note that uniform() args can be swapped.
........
r66538 | georg.brandl | 2008-09-21 05:03:39 -0500 (Sun, 21 Sep 2008) | 2 lines
Add "dist" target.
........
r66544 | benjamin.peterson | 2008-09-21 16:27:51 -0500 (Sun, 21 Sep 2008) | 4 lines
#3879 fix a regression in urllib.getproxies_environment
reviewers: Benjamin, Georg
........
r66546 | georg.brandl | 2008-09-21 17:31:59 -0500 (Sun, 21 Sep 2008) | 2 lines
Fill out download page.
........
diff --git a/Doc/Makefile b/Doc/Makefile
index 0cbd93f..77b84f5 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -9,22 +9,23 @@
SPHINXOPTS =
PAPER =
SOURCES =
+DISTVERSION =
ALLSPHINXOPTS = -b $(BUILDER) -d build/doctrees -D latex_paper_size=$(PAPER) \
$(SPHINXOPTS) . build/$(BUILDER) $(SOURCES)
-.PHONY: help checkout update build html web htmlhelp clean coverage
+.PHONY: help checkout update build html htmlhelp clean coverage dist
help:
@echo "Please use \`make <target>' where <target> is one of"
@echo " html to make standalone HTML files"
- @echo " web to make file usable by Sphinx.web"
@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 " dist to create a \"dist\" directory with archived docs for download"
checkout:
@if [ ! -d tools/sphinx ]; then \
@@ -59,12 +60,6 @@
html: build
@echo "Build finished. The HTML pages are in build/html."
-web: BUILDER = web
-web: build
- @echo "Build finished; now you can run"
- @echo " PYTHONPATH=tools $(PYTHON) -m sphinx.web build/web"
- @echo "to start the server."
-
htmlhelp: BUILDER = htmlhelp
htmlhelp: build
@echo "Build finished; now you can run HTML Help Workshop with the" \
@@ -105,6 +100,44 @@
htmlview: html
$(PYTHON) -c "import webbrowser; webbrowser.open('build/html/index.html')"
+
clean:
-rm -rf build/*
-rm -rf tools/sphinx
+
+dist:
+ -rm -rf dist
+ mkdir -p dist
+
+ # archive the HTML
+ make html
+ cp -a build/html dist/python$(DISTVERSION)-docs-html
+ tar -C dist -cf dist/python$(DISTVERSION)-docs-html.tar python$(DISTVERSION)-docs-html
+ bzip2 -9 -k dist/python$(DISTVERSION)-docs-html.tar
+ (cd dist; zip -q -r -9 python$(DISTVERSION)-docs-html.zip python$(DISTVERSION)-docs-html)
+ rm -r dist/python$(DISTVERSION)-docs-html
+ rm dist/python$(DISTVERSION)-docs-html.tar
+
+ # archive the text build
+ make text
+ cp -a build/text dist/python$(DISTVERSION)-docs-text
+ tar -C dist -cf dist/python$(DISTVERSION)-docs-text.tar python$(DISTVERSION)-docs-text
+ bzip2 -9 -k dist/python$(DISTVERSION)-docs-text.tar
+ (cd dist; zip -q -r -9 python$(DISTVERSION)-docs-text.zip python$(DISTVERSION)-docs-text)
+ rm -r dist/python$(DISTVERSION)-docs-text
+ rm dist/python$(DISTVERSION)-docs-text.tar
+
+ # archive the A4 latex
+ -rm -r build/latex
+ make latex PAPER=a4
+ (cd build/latex; make clean && make all-pdf && make FMT=pdf zip bz2)
+ cp build/latex/docs-pdf.zip dist/python$(DISTVERSION)-docs-pdf-a4.zip
+ cp build/latex/docs-pdf.tar.bz2 dist/python$(DISTVERSION)-docs-pdf-a4.tar.bz2
+
+ # archive the letter latex
+ rm -r build/latex
+ make latex PAPER=letter
+ (cd build/latex; make clean && make all-pdf && make FMT=pdf zip bz2)
+ cp build/latex/docs-pdf.zip dist/python$(DISTVERSION)-docs-pdf-letter.zip
+ cp build/latex/docs-pdf.tar.bz2 dist/python$(DISTVERSION)-docs-pdf-letter.tar.bz2
+