[Python-checkins] r62335 - in python/branches/py3k: Doc/Makefile Doc/make.bat

[benjamin.peterson]

Author: benjamin.peterson
Date: Mon Apr 14 01:11:15 2008
New Revision: 62335

Log:
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.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Doc/Makefile
   python/branches/py3k/Doc/make.bat

Modified: python/branches/py3k/Doc/Makefile
==============================================================================
--- python/branches/py3k/Doc/Makefile	(original)
+++ python/branches/py3k/Doc/Makefile	Mon Apr 14 01:11:15 2008
@@ -34,6 +34,10 @@
 	  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 @@
 update: checkout
 	svn update tools/sphinx
 	svn update tools/docutils
+	svn update tools/jinja
 	svn update tools/pygments
 
 build: checkout

Modified: python/branches/py3k/Doc/make.bat
==============================================================================
--- python/branches/py3k/Doc/make.bat	(original)
+++ python/branches/py3k/Doc/make.bat	Mon Apr 14 01:11:15 2008
@@ -28,12 +28,14 @@
 :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