[Python-checkins] r78913 - in python/branches/release26-maint: Doc/Makefile Doc/README.txt Doc/make.bat
georg.brandl
python-checkins at python.org
Sat Mar 13 11:59:09 CET 2010
Author: georg.brandl
Date: Sat Mar 13 11:59:09 2010
New Revision: 78913
Log:
Merged revisions 78910 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78910 | georg.brandl | 2010-03-13 11:54:12 +0100 (Sa, 13 Mär 2010) | 1 line
Bump externals versions for doc build.
........
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/Doc/Makefile
python/branches/release26-maint/Doc/README.txt
python/branches/release26-maint/Doc/make.bat
Modified: python/branches/release26-maint/Doc/Makefile
==============================================================================
--- python/branches/release26-maint/Doc/Makefile (original)
+++ python/branches/release26-maint/Doc/Makefile Sat Mar 13 11:59:09 2010
@@ -32,19 +32,19 @@
checkout:
@if [ ! -d tools/sphinx ]; then \
echo "Checking out Sphinx..."; \
- svn checkout $(SVNROOT)/external/Sphinx-0.6.3/sphinx tools/sphinx; \
+ svn checkout $(SVNROOT)/external/Sphinx-0.6.5/sphinx tools/sphinx; \
fi
@if [ ! -d tools/docutils ]; then \
echo "Checking out Docutils..."; \
- svn checkout $(SVNROOT)/external/docutils-0.5/docutils tools/docutils; \
+ svn checkout $(SVNROOT)/external/docutils-0.6/docutils tools/docutils; \
fi
@if [ ! -d tools/jinja2 ]; then \
echo "Checking out Jinja..."; \
- svn checkout $(SVNROOT)/external/Jinja-2.1.1/jinja2 tools/jinja2; \
+ svn checkout $(SVNROOT)/external/Jinja-2.3.1/jinja2 tools/jinja2; \
fi
@if [ ! -d tools/pygments ]; then \
echo "Checking out Pygments..."; \
- svn checkout $(SVNROOT)/external/Pygments-1.1.1/pygments tools/pygments; \
+ svn checkout $(SVNROOT)/external/Pygments-1.3.1/pygments tools/pygments; \
fi
update: clean checkout
Modified: python/branches/release26-maint/Doc/README.txt
==============================================================================
--- python/branches/release26-maint/Doc/README.txt (original)
+++ python/branches/release26-maint/Doc/README.txt Sat Mar 13 11:59:09 2010
@@ -72,25 +72,27 @@
Without make
------------
-You'll need to checkout the Sphinx package to the `tools/` directory::
+You'll need to install the Sphinx package, either by checking it out via ::
- svn co http://svn.python.org/projects/external/Sphinx-0.6.1/sphinx tools/sphinx
+ svn co http://svn.python.org/projects/external/Sphinx-0.6.5/sphinx tools/sphinx
+
+or by installing it from PyPI.
Then, you need to install Docutils, either by checking it out via ::
- svn co http://svn.python.org/projects/external/docutils-0.5/docutils tools/docutils
+ svn co http://svn.python.org/projects/external/docutils-0.6/docutils tools/docutils
or by installing it from http://docutils.sf.net/.
You also need Jinja2, either by checking it out via ::
- svn co http://svn.python.org/projects/external/Jinja-2.1.1/jinja2 tools/jinja2
+ svn co http://svn.python.org/projects/external/Jinja-2.3.1/jinja2 tools/jinja2
or by installing it from PyPI.
You can optionally also install Pygments, either as a checkout via ::
- svn co http://svn.python.org/projects/external/Pygments-0.11.1/pygments tools/pygments
+ svn co http://svn.python.org/projects/external/Pygments-1.3.1/pygments tools/pygments
or from PyPI at http://pypi.python.org/pypi/Pygments.
Modified: python/branches/release26-maint/Doc/make.bat
==============================================================================
--- python/branches/release26-maint/Doc/make.bat (original)
+++ python/branches/release26-maint/Doc/make.bat Sat Mar 13 11:59:09 2010
@@ -34,10 +34,10 @@
goto end
:checkout
-svn co %SVNROOT%/external/Sphinx-0.6.3/sphinx tools/sphinx
-svn co %SVNROOT%/external/docutils-0.5/docutils tools/docutils
-svn co %SVNROOT%/external/Jinja-2.1.1/jinja2 tools/jinja2
-svn co %SVNROOT%/external/Pygments-0.11.1/pygments tools/pygments
+svn co %SVNROOT%/external/Sphinx-0.6.5/sphinx tools/sphinx
+svn co %SVNROOT%/external/docutils-0.6/docutils tools/docutils
+svn co %SVNROOT%/external/Jinja-2.3.1/jinja2 tools/jinja2
+svn co %SVNROOT%/external/Pygments-1.3.1/pygments tools/pygments
goto end
:update
More information about the Python-checkins
mailing list