Merged revisions 77173 via svnmerge from

svn+ssh://svn.python.org/python/branches/py3k

................
  r77173 | benjamin.peterson | 2009-12-31 04:35:15 +0100 (Do, 31 Dez 2009) | 13 lines

  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.
  ........
................
This commit is contained in:
Georg Brandl 2010-03-13 10:02:01 +00:00
parent 87e62f0722
commit da746d7a0e
3 changed files with 6 additions and 7 deletions

View File

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

View File

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

View File

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