Bug 831485 comm-central should use mozilla-central's virtualenv r=Callek
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Sun, 24 Feb 2013 00:25:30 +0000
changeset 15035 fb586ffef6e84306a5e7b127d51f31045453dbb6
parent 15034 e24df89d9b22199a21f40788f2ddb421e58c04fc
child 15036 97ec0b9859f156ebeae3a95a7edb5b86db85a1ea
push id898
push userbugzilla@standard8.plus.com
push dateMon, 13 May 2013 17:03:31 +0000
treeherdercomm-beta@3106694b14de [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek
bugs831485
Bug 831485 comm-central should use mozilla-central's virtualenv r=Callek
aclocal.m4
configure.in
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,16 +13,17 @@ builtin(include, mozilla/build/autoconf/
 builtin(include, mozilla/build/autoconf/altoptions.m4)dnl
 builtin(include, mozilla/build/autoconf/mozprog.m4)dnl
 builtin(include, mozilla/build/autoconf/acwinpaths.m4)dnl
 builtin(include, mozilla/build/autoconf/lto.m4)dnl
 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()
 
 # Read the user's .mozconfig script.  We can't do this in
 # configure.in: autoconf puts the argument parsing code above anything
 # expanded from configure.in, and we need to get the configure options
 # from .mozconfig in place before that argument parsing code.
 MOZ_READ_MOZCONFIG(mozilla)
--- a/configure.in
+++ b/configure.in
@@ -122,42 +122,23 @@ then
 	*     1. cd $_topsrcdir
 	*     2. gmake distclean
 	***
 	EOF
     exit 1
     break
   fi
 fi
+
+MOZ_BUILD_ROOT=`pwd`/mozilla
+MOZILLA_CENTRAL_PATH=$_topsrcdir/mozilla
+MOZ_PYTHON
+
 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
-
-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_DEFAULT_COMPILER
 
 COMPILE_ENVIRONMENT=1
 MOZ_ARG_DISABLE_BOOL(compile-environment,
 [  --disable-compile-environment
                            Disable compiler/library checks.],
     COMPILE_ENVIRONMENT= )
 AC_SUBST(COMPILE_ENVIRONMENT)