Permalink
Browse files

Bug 831485 comm-central should use mozilla-central's virtualenv r=Callek

  • Loading branch information...
1 parent 2f93bb3 commit fc2c0fc789e54cabcdda556ba3e64cd213ecd648 Neil Rashbrook committed Feb 24, 2013
Showing with 5 additions and 23 deletions.
  1. +1 −0 aclocal.m4
  2. +4 −23 configure.in
View
1 aclocal.m4
@@ -18,6 +18,7 @@ builtin(include, mozilla/build/autoconf/frameptr.m4)dnl
builtin(include, mozilla/build/autoconf/compiler-opts.m4)dnl
builtin(include, mozilla/build/autoconf/zlib.m4)dnl
builtin(include, mozilla/build/autoconf/expandlibs.m4)dnl
+builtin(include, mozilla/build/autoconf/python-virtualenv.m4)dnl
MOZ_PROG_CHECKMSYS()
View
27 configure.in
@@ -127,31 +127,12 @@ then
break
fi
fi
-MOZ_BUILD_ROOT=`pwd`
-
-MOZ_PATH_PROGS(PYTHON, $PYTHON python2.7 python)
-if test -z "$PYTHON"; then
- AC_MSG_ERROR([python was not found in \$PATH])
-fi
-AC_MSG_RESULT([Creating Python environment])
-dnl This verifies our Python version is sane and ensures the Python
-dnl virtualenv is present and up to date. It sanitizes the environment
-dnl for us, so we don't need to clean anything out.
-$PYTHON $_topsrcdir/mozilla/build/virtualenv/populate_virtualenv.py \
- $_topsrcdir/mozilla $MOZ_BUILD_ROOT/_virtualenv || exit 1
+MOZ_BUILD_ROOT=`pwd`/mozilla
+MOZILLA_CENTRAL_PATH=$_topsrcdir/mozilla
+MOZ_PYTHON
-dnl Create a virtualenv where we can install local Python packages
-case "$host_os" in
-mingw*)
- PYTHON=`cd $MOZ_BUILD_ROOT && pwd -W`/_virtualenv/Scripts/python.exe
- ;;
-*)
- PYTHON=$MOZ_BUILD_ROOT/_virtualenv/bin/python
- ;;
-esac
-
-AC_SUBST(PYTHON)
+MOZ_BUILD_ROOT=`pwd`
MOZ_DEFAULT_COMPILER

0 comments on commit fc2c0fc

Please sign in to comment.