summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-04-13 23:11:15 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-04-13 23:11:15 (GMT)
commitd860762ce571f5ae97e6ffdc46301575ef37b862 (patch)
treecb97a450c08aceba5ec6ef6fe27ffcac7a5415f9
parentb85a584565dcab0cf8dfa0f23881961d425b62fa (diff)
downloadcpython-d860762ce571f5ae97e6ffdc46301575ef37b862.zip
cpython-d860762ce571f5ae97e6ffdc46301575ef37b862.tar.gz
cpython-d860762ce571f5ae97e6ffdc46301575ef37b862.tar.bz2
Merged revisions 62332 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r62332 | georg.brandl | 2008-04-13 15:51:27 -0500 (Sun, 13 Apr 2008) | 2 lines Check out Jinja as a separate step now that it's not included in the Sphinx package anymore. ........
-rw-r--r--Doc/Makefile5
-rw-r--r--Doc/make.bat2
2 files changed, 7 insertions, 0 deletions
diff --git a/Doc/Makefile b/Doc/Makefile
index 7517e5f..6274d4d 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -34,6 +34,10 @@ checkout:
echo "Checking out Docutils..."; \
svn checkout $(SVNROOT)/external/docutils-0.4/docutils tools/docutils; \
fi
+ @if [ ! -d tools/jinja ]; then \
+ echo "Checking out Jinja..."; \
+ svn checkout $(SVNROOT)/external/Jinja-1.1/jinja tools/jinja; \
+ fi
@if [ ! -d tools/pygments ]; then \
echo "Checking out Pygments..."; \
svn checkout $(SVNROOT)/external/Pygments-0.9/pygments tools/pygments; \
@@ -42,6 +46,7 @@ checkout:
update: checkout
svn update tools/sphinx
svn update tools/docutils
+ svn update tools/jinja
svn update tools/pygments
build: checkout
diff --git a/Doc/make.bat b/Doc/make.bat
index 504e4b5..d3379c1 100644
--- a/Doc/make.bat
+++ b/Doc/make.bat
@@ -28,12 +28,14 @@ goto end
:checkout
svn co %SVNROOT%/doctools/trunk/sphinx tools/sphinx
svn co %SVNROOT%/external/docutils-0.4/docutils tools/docutils
+svn co %SVNROOT%/external/Jinja-1.1/jinja tools/jinja
svn co %SVNROOT%/external/Pygments-0.9/pygments tools/pygments
goto end
:update
svn update tools/sphinx
svn update tools/docutils
+svn update tools/jinja
svn update tools/pygments
goto end