Merged revisions 77151-77152 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77151 | georg.brandl | 2009-12-30 12:32:50 -0600 (Wed, 30 Dec 2009) | 1 line
#7487: update Pygments version.
........
r77152 | georg.brandl | 2009-12-30 12:36:09 -0600 (Wed, 30 Dec 2009) | 1 line
#7602: improve "clean" and "checkout" targets now that all tools are in externals.
........
diff --git a/Doc/Makefile b/Doc/Makefile
index a8b46bd..cc47e40 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -47,11 +47,7 @@
svn checkout $(SVNROOT)/external/Pygments-1.1.1/pygments tools/pygments; \
fi
-update: checkout
- svn update tools/sphinx
- svn update tools/docutils
- svn update tools/jinja2
- svn update tools/pygments
+update: clean checkout
build: checkout
mkdir -p build/$(BUILDER) build/doctrees
@@ -111,6 +107,9 @@
clean:
-rm -rf build/*
-rm -rf tools/sphinx
+ -rm -rf tools/pygments
+ -rm -rf tools/jinja2
+ -rm -rf tools/docutils
dist:
-rm -rf dist
diff --git a/Doc/README.txt b/Doc/README.txt
index 3e9093a..fedf71f 100644
--- a/Doc/README.txt
+++ b/Doc/README.txt
@@ -95,7 +95,7 @@
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.1.1/pygments tools/pygments
or from PyPI at http://pypi.python.org/pypi/Pygments.
diff --git a/Doc/make.bat b/Doc/make.bat
index aeb8974..9dede61 100644
--- a/Doc/make.bat
+++ b/Doc/make.bat
@@ -37,7 +37,7 @@
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/Pygments-1.1.1/pygments tools/pygments
goto end
:update