Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

bug 661908 - create a virtualenv as part of configure. r=khuey

--HG--
extra : rebase_source : c0d8d3a
  • Loading branch information...
commit 423a4219223f1cd70172e2d0d4aea7f54a11c343 1 parent a7e6778
Ted Mielczarek authored
1  allmakefiles.sh
@@ -30,6 +30,7 @@ build/Makefile
30 30 build/pgo/Makefile
31 31 build/pgo/blueprint/Makefile
32 32 build/pgo/js-input/Makefile
  33 +build/virtualenv/Makefile
33 34 config/Makefile
34 35 config/autoconf.mk
35 36 config/nspr/Makefile
15 build/virtualenv/Makefile.in
... ... @@ -0,0 +1,15 @@
  1 +# This Source Code Form is subject to the terms of the Mozilla Public
  2 +# License, v. 2.0. If a copy of the MPL was not distributed with this file,
  3 +# You can obtain one at http://mozilla.org/MPL/2.0/.
  4 +
  5 +DEPTH = ../..
  6 +topsrcdir = @top_srcdir@
  7 +srcdir = @srcdir@
  8 +VPATH = @srcdir@
  9 +
  10 +include $(DEPTH)/config/autoconf.mk
  11 +
  12 +default::
  13 +# install some packages
  14 +
  15 +include $(topsrcdir)/config/rules.mk
26 configure.in
@@ -7921,10 +7921,9 @@ else
7921 7921 fi
7922 7922 AC_SUBST(CL_INCLUDES_PREFIX)
7923 7923 rm -f dummy-hello.c
7924   - _topsrcdirwin=`cd \`dirname $0\`; pwd -W`
7925 7924 dnl cl.py provides dependency generation for MSVC
7926   - CC_WRAPPER="$PYTHON -O $_topsrcdirwin/build/cl.py"
7927   - CXX_WRAPPER="$PYTHON -O $_topsrcdirwin/build/cl.py"
  7925 + CC_WRAPPER='$(PYTHON) -O $(topsrcdir)/build/cl.py'
  7926 + CXX_WRAPPER='$(PYTHON) -O $(topsrcdir)/build/cl.py'
7928 7927 COMPILER_DEPEND=1
7929 7928 fi
7930 7929 fi
@@ -8566,7 +8565,6 @@ AC_SUBST(MOZ_MAPINFO)
8566 8565 AC_SUBST(MOZ_BROWSE_INFO)
8567 8566 AC_SUBST(MOZ_TOOLS_DIR)
8568 8567 AC_SUBST(WIN32_REDIST_DIR)
8569   -AC_SUBST(PYTHON)
8570 8568 AC_SUBST(MAKENSISU)
8571 8569
8572 8570 dnl Echo the CFLAGS to remove extra whitespace.
@@ -8948,6 +8946,22 @@ AC_SUBST(MOZ_DEFINES)
8948 8946 rm -f confdefs.h
8949 8947 mv confdefs.h.save confdefs.h
8950 8948
  8949 +dnl Create a virtualenv where we can install local Python packages
  8950 +AC_MSG_RESULT([Creating Python virtualenv])
  8951 +rm -rf _virtualenv
  8952 +mkdir -p _virtualenv
  8953 +$PYTHON $_topsrcdir/other-licenses/virtualenv/virtualenv.py ./_virtualenv
  8954 +case "$host_os" in
  8955 +mingw*)
  8956 + PYTHON=`pwd`/_virtualenv/Scripts/python.exe
  8957 + ;;
  8958 +*)
  8959 + PYTHON=`pwd`/_virtualenv/bin/python
  8960 + ;;
  8961 +esac
  8962 +
  8963 +AC_SUBST(PYTHON)
  8964 +
8951 8965 dnl Load the list of Makefiles to generate.
8952 8966 dnl To add new Makefiles, edit allmakefiles.sh.
8953 8967 dnl allmakefiles.sh sets the variable, MAKEFILES.
@@ -8971,6 +8985,10 @@ mv -f config/autoconf.mk config/autoconf.mk.orig 2> /dev/null
8971 8985
8972 8986 AC_OUTPUT($MAKEFILES)
8973 8987
  8988 +# Populate the virtualenv
  8989 +AC_MSG_RESULT([Populating Python virtualenv])
  8990 +$MAKE -C build/virtualenv || exit 1
  8991 +
8974 8992 # Generate a JSON config file for unittest harnesses etc to read
8975 8993 # build configuration details from in a standardized way.
8976 8994 OS_TARGET=${OS_TARGET} TARGET_CPU=${TARGET_CPU} MOZ_DEBUG=${MOZ_DEBUG} \
3  toolkit/crashreporter/tools/symbolstore.py
@@ -352,7 +352,10 @@ def GetVCSFilename(file, srcdirs):
352 352 def GetPlatformSpecificDumper(**kwargs):
353 353 """This function simply returns a instance of a subclass of Dumper
354 354 that is appropriate for the current platform."""
  355 + # Python 2.5 has a bug where platform.system() returns 'Microsoft'.
  356 + # Remove this when we no longer support Python 2.5.
355 357 return {'Windows': Dumper_Win32,
  358 + 'Microsoft': Dumper_Win32,
356 359 'Linux': Dumper_Linux,
357 360 'Sunos5': Dumper_Solaris,
358 361 'Darwin': Dumper_Mac}[platform.system()](**kwargs)

0 comments on commit 423a421

Please sign in to comment.
Something went wrong with that request. Please try again.