wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 907902 - Create system isolated virtualenv, remove --system-ply support; r=glandium

Browse Source
This commit is contained in:
Gregory Szorc 2013-09-16 17:21:59 -07:00
parent 0a0d5b1fbe
commit b31c10426d
5 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/virtualenv/populate_virtualenv.py
View File

@ -113,7 +113,7 @@ class VirtualenvManager(object):
env.pop('PYTHONDONTWRITEBYTECODE', None)
args = [sys.executable, self.virtualenv_script_path,
'--system-site-packages', self.virtualenv_root]
self.virtualenv_root]
result = subprocess.call(args, stdout=self.log_handle,
stderr=subprocess.STDOUT, env=env)

3
config/config.mk
View File

@ -793,10 +793,7 @@ endif
EXPAND_LIBNAME_PATH = $(foreach lib,$(1),$(2)/$(LIB_PREFIX)$(lib).$(LIB_SUFFIX))
EXPAND_MOZLIBNAME = $(foreach lib,$(1),$(DIST)/lib/$(LIB_PREFIX)$(lib).$(LIB_SUFFIX))
# Include internal ply only if needed
ifndef MOZ_SYSTEM_PLY
PLY_INCLUDE = -I$(topsrcdir)/other-licenses/ply
endif
export CL_INCLUDES_PREFIX

10
configure.in
View File

@ -721,16 +721,6 @@ else
AC_MSG_RESULT([yes])
fi
MOZ_ARG_WITH_BOOL(system-ply,
[ --with-system-ply Use system installed python ply library],
[if $PYTHON -c 'import ply' 2>&5; then
MOZ_SYSTEM_PLY=1
else
AC_MSG_ERROR([python ply library is not found but --with-system-ply was requested])
fi])
AC_SUBST(MOZ_SYSTEM_PLY)
if test -z "$COMPILE_ENVIRONMENT"; then
NSINSTALL_BIN='$(PYTHON) $(topsrcdir)/config/nsinstall.py'
fi

3
js/src/config/config.mk
View File

@ -793,10 +793,7 @@ endif
EXPAND_LIBNAME_PATH = $(foreach lib,$(1),$(2)/$(LIB_PREFIX)$(lib).$(LIB_SUFFIX))
EXPAND_MOZLIBNAME = $(foreach lib,$(1),$(DIST)/lib/$(LIB_PREFIX)$(lib).$(LIB_SUFFIX))
# Include internal ply only if needed
ifndef MOZ_SYSTEM_PLY
PLY_INCLUDE = -I$(topsrcdir)/other-licenses/ply
endif
export CL_INCLUDES_PREFIX

2
xpcom/idl-parser/Makefile.in
View File

@ -17,7 +17,6 @@ SDK_BINARY = \
SDK_BINARY_TARGET = xpidl-parser
ifndef MOZ_SYSTEM_PLY
PLY_FILES = \
$(topsrcdir)/other-licenses/ply/ply/__init__.py \
$(topsrcdir)/other-licenses/ply/ply/lex.py \
@ -27,7 +26,6 @@ PLY_FILES = \
PLY_DEST = $(SDK_BIN_DIR)/ply
INSTALL_TARGETS += PLY
PLY_TARGET = xpidl-parser
endif
include $(topsrcdir)/config/rules.mk