[Python-checkins] r77173 - in python/branches/py3k: Doc/Makefile Doc/README.txt Doc/make.bat
benjamin.peterson
python-checkins at python.org
Thu Dec 31 04:35:15 CET 2009
Author: benjamin.peterson
Date: Thu Dec 31 04:35:15 2009
New Revision: 77173
Log:
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.
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Doc/Makefile
python/branches/py3k/Doc/README.txt
python/branches/py3k/Doc/make.bat
Modified: python/branches/py3k/Doc/Makefile
==============================================================================
--- python/branches/py3k/Doc/Makefile (original)
+++ python/branches/py3k/Doc/Makefile Thu Dec 31 04:35:15 2009
@@ -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
Modified: python/branches/py3k/Doc/README.txt
==============================================================================
--- python/branches/py3k/Doc/README.txt (original)
+++ python/branches/py3k/Doc/README.txt Thu Dec 31 04:35:15 2009
@@ -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.
Modified: python/branches/py3k/Doc/make.bat
==============================================================================
--- python/branches/py3k/Doc/make.bat (original)
+++ python/branches/py3k/Doc/make.bat Thu Dec 31 04:35:15 2009
@@ -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
More information about the Python-checkins
mailing list