Bug 804865 - Require Python 2.7 to build the tree; r=ted

This commit is contained in:
Gregory Szorc 2012-12-20 15:45:26 -08:00
Родитель 47e12d6a1f
Коммит 894bf5e205
3 изменённых файлов: 5 добавлений и 8 удалений

Просмотреть файл

@ -16,7 +16,7 @@ import sys
# Minimum version of Python required to build.
MINIMUM_PYTHON_MAJOR = 2
MINIMUM_PYTHON_MINOR = 6
MINIMUM_PYTHON_MINOR = 7
class VirtualenvManager(object):

Просмотреть файл

@ -139,7 +139,7 @@ else
touch $_objdir/CLOBBER
fi
MOZ_PATH_PROGS(PYTHON, $PYTHON python2.7 python2.6 python2.5 python)
MOZ_PATH_PROGS(PYTHON, $PYTHON python2.7 python)
if test -z "$PYTHON"; then
AC_MSG_ERROR([python was not found in \$PATH])
fi

Просмотреть файл

@ -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.6
PYTHON_VERSION=2.7
WINDRES_VERSION=2.14.90
W32API_VERSION=3.14
@ -665,7 +665,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 python)
if test -z "$PYTHON"; then
AC_MSG_ERROR([python was not found in \$PATH])
fi
@ -1404,8 +1404,6 @@ dnl System overrides of the defaults for host
dnl ========================================================
case "$host" in
*mingw*)
# 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:"$@"'
@ -1465,8 +1463,7 @@ case "$host" in
;;
esac
dnl We require version 2.4 or newer of Python to build,
dnl and 2.5 or newer on Windows.
dnl We require version 2.7 of Python to build.
AC_MSG_CHECKING([for Python version >= $PYTHON_VERSION but not 3.x])
changequote(,)
$PYTHON -c "import sys; sys.exit(sys.version[:3] < sys.argv[1] or sys.version[:2] != '2.')" $PYTHON_VERSION