Mercurial > hg
changeset 23140:fbd79c2552a6
contrib: update build defaults to latest Python and docutils versions
Use Python 2.7.8 and Docutils 0.12 for Makefile.python and buildrpm (CentOS 5
rpms).
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Sun, 02 Nov 2014 16:39:02 +0100 |
| parents | e53f6b72a0e4 |
| children | a440166d03fc |
| files | contrib/Makefile.python contrib/mercurial.spec |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/Makefile.python Thu Apr 17 22:47:38 2014 +0200 +++ b/contrib/Makefile.python Sun Nov 02 16:39:02 2014 +0100 @@ -1,4 +1,4 @@ -PYTHONVER=2.7.6 +PYTHONVER=2.7.8 PYTHONNAME=python- PREFIX=$(HOME)/bin/prefix-$(PYTHONNAME)$(PYTHONVER) SYMLINKDIR=$(HOME)/bin @@ -27,7 +27,7 @@ # debian: apt-get install zlib1g-dev libbz2-dev libssl-dev @echo @echo 'To build a nice collection of interesting Python versions:' - @echo ' $$ for v in 2.{4{,.2,.3},5{,.6},6{,.1,.2,.9},7{,.6}}; do' + @echo ' $$ for v in 2.{4{,.2,.3},5{,.6},6{,.1,.2,.9},7{,.8}}; do' @echo ' make -f Makefile.python symlink PYTHONVER=$$v || break; done' @echo 'To run a Mercurial test on all these Python versions:' @echo ' $$ for py in `cd ~/bin && ls $(PYTHONNAME)2.*`; do' @@ -60,7 +60,7 @@ printf 'import sys, zlib, bz2\nif sys.version_info >= (2,6):\n import ssl' | $(PREFIX)/bin/python rm -rf $(PYTHON_SRCDIR) -DOCUTILSVER=0.11 +DOCUTILSVER=0.12 DOCUTILS_SRCDIR=docutils-$(DOCUTILSVER) DOCUTILS_SRCFILE=$(DOCUTILS_SRCDIR).tar.gz
--- a/contrib/mercurial.spec Thu Apr 17 22:47:38 2014 +0200 +++ b/contrib/mercurial.spec Sun Nov 02 16:39:02 2014 +0100 @@ -6,7 +6,7 @@ %global pythonver %{withpython} %global pythonname Python-%{withpython} -%global docutilsname docutils-0.11 +%global docutilsname docutils-0.12 %global pythonhg python-hg %global hgpyprefix /usr/%{pythonhg} # byte compilation will fail on some some Python /test/ files