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

diff --git a/Doc/Makefile b/Doc/Makefile
index 7517e5f9c4e3e584823ebbb5c9018c01547e6e42..6274d4d8cbca8d4c0684782f5b969ae26d6875b6 100644 (file)
--- 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 504e4b58e47acc73c8f2836e617e48ab9589e7f2..d3379c114e4d25794cc8c41262386467dbf1d4c4 100644 (file)
--- a/Doc/make.bat
+++ b/Doc/make.bat
@@ -28,12 +28,14 @@ goto end
 :checkout\r
 svn co %SVNROOT%/doctools/trunk/sphinx tools/sphinx\r
 svn co %SVNROOT%/external/docutils-0.4/docutils tools/docutils\r
+svn co %SVNROOT%/external/Jinja-1.1/jinja tools/jinja\r
 svn co %SVNROOT%/external/Pygments-0.9/pygments tools/pygments\r
 goto end\r
 \r
 :update\r
 svn update tools/sphinx\r
 svn update tools/docutils\r
+svn update tools/jinja\r
 svn update tools/pygments\r
 goto end\r
 \r