Commit ac2e8efb authored by Benjamin Peterson's avatar Benjamin Peterson

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.
........
parent 05f86ebb
...@@ -47,11 +47,7 @@ checkout: ...@@ -47,11 +47,7 @@ checkout:
svn checkout $(SVNROOT)/external/Pygments-1.1.1/pygments tools/pygments; \ svn checkout $(SVNROOT)/external/Pygments-1.1.1/pygments tools/pygments; \
fi fi
update: checkout update: clean checkout
svn update tools/sphinx
svn update tools/docutils
svn update tools/jinja2
svn update tools/pygments
build: checkout build: checkout
mkdir -p build/$(BUILDER) build/doctrees mkdir -p build/$(BUILDER) build/doctrees
...@@ -111,6 +107,9 @@ htmlview: html ...@@ -111,6 +107,9 @@ htmlview: html
clean: clean:
-rm -rf build/* -rm -rf build/*
-rm -rf tools/sphinx -rm -rf tools/sphinx
-rm -rf tools/pygments
-rm -rf tools/jinja2
-rm -rf tools/docutils
dist: dist:
-rm -rf dist -rm -rf dist
......
...@@ -95,7 +95,7 @@ or by installing it from PyPI. ...@@ -95,7 +95,7 @@ or by installing it from PyPI.
You can optionally also install Pygments, either as a checkout via :: 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. or from PyPI at http://pypi.python.org/pypi/Pygments.
......
...@@ -37,7 +37,7 @@ goto end ...@@ -37,7 +37,7 @@ goto end
svn co %SVNROOT%/external/Sphinx-0.6.3/sphinx tools/sphinx 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/docutils-0.5/docutils tools/docutils
svn co %SVNROOT%/external/Jinja-2.1.1/jinja2 tools/jinja2 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 goto end
:update :update
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment