Bug 800614 - Require Python 2.6 to build the tree; r=ted

Previous minimum Python was 2.5.

This only affects the build system. Some code (including some testing
code) still needs to run on older versions of Python.
This commit is contained in:
Gregory Szorc 2012-10-19 11:13:37 -07:00
parent 655049da80
commit b8ead98943
2 changed files with 6 additions and 6 deletions

View File

@ -63,7 +63,7 @@ dnl ========================================================
GLIB_VERSION=1.2.0
PERL_VERSION=5.006
PYTHON_VERSION_MAJOR=2
PYTHON_VERSION_MINOR=5
PYTHON_VERSION_MINOR=6
CAIRO_VERSION=1.10
PANGO_VERSION=1.14.0
GTK2_VERSION=2.10.0
@ -803,7 +803,7 @@ else
AC_MSG_RESULT([yes])
fi
MOZ_PATH_PROGS(PYTHON, $PYTHON python2.7 python2.6 python2.5 python)
MOZ_PATH_PROGS(PYTHON, $PYTHON python2.7 python2.6 python)
if test -z "$PYTHON"; then
AC_MSG_ERROR([python was not found in \$PATH])
fi
@ -1839,7 +1839,7 @@ case "$host" in
;;
esac
dnl We require version 2.5 or newer of Python to build.
dnl We require version 2.6 or newer of Python to build.
AC_MSG_CHECKING([for Python version >= $PYTHON_VERSION_MAJOR.$PYTHON_VERSION_MINOR but not 3.x])
changequote(:)

View File

@ -55,7 +55,7 @@ NSPR_VERSION=4
dnl Set the minimum version of toolkit libs used by mozilla
dnl ========================================================
PERL_VERSION=5.006
PYTHON_VERSION=2.5
PYTHON_VERSION=2.6
WINDRES_VERSION=2.14.90
W32API_VERSION=3.14
@ -1405,8 +1405,8 @@ dnl System overrides of the defaults for host
dnl ========================================================
case "$host" in
*mingw*)
# we need Python 2.5 on Windows
PYTHON_VERSION=2.5
# we need Python 2.6 on Windows
PYTHON_VERSION=2.6
if test -n "$_WIN32_MSVC"; then
HOST_AR=lib
HOST_AR_FLAGS='-NOLOGO -OUT:"$@"'