зеркало из https://github.com/mozilla/gecko-dev.git
Bug 737006 - Use internal ply only if needed. r=khuey
This commit is contained in:
Родитель
5996ca7f8c
Коммит
bd9ba0040a
|
@ -837,3 +837,8 @@ EXPAND_LIBNAME = $(foreach lib,$(1),$(LIB_PREFIX)$(lib).$(LIB_SUFFIX))
|
|||
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
|
||||
|
|
|
@ -1444,7 +1444,7 @@ xpidl-preqs = \
|
|||
$(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(xpidl-preqs)
|
||||
$(REPORT_BUILD)
|
||||
$(PYTHON_PATH) \
|
||||
-I$(topsrcdir)/other-licenses/ply \
|
||||
$(PLY_INCLUDE) \
|
||||
-I$(topsrcdir)/xpcom/idl-parser \
|
||||
$(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
|
||||
@if test -n "$(findstring $*.h, $(EXPORTS))"; \
|
||||
|
@ -1456,7 +1456,7 @@ ifndef NO_GEN_XPT
|
|||
$(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DEPS) $(xpidl-preqs)
|
||||
$(REPORT_BUILD)
|
||||
$(PYTHON_PATH) \
|
||||
-I$(topsrcdir)/other-licenses/ply \
|
||||
$(PLY_INCLUDE) \
|
||||
-I$(topsrcdir)/xpcom/idl-parser \
|
||||
-I$(topsrcdir)/xpcom/typelib/xpt/tools \
|
||||
$(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# # License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
# # You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
# You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
|
@ -75,18 +75,20 @@ bindinggen_dependencies := \
|
|||
$(binding_header_files): %Binding.h: $(bindinggen_dependencies) \
|
||||
$(webidl_base)/%.webidl \
|
||||
$(NULL)
|
||||
$(PYTHON) $(topsrcdir)/config/pythonpath.py \
|
||||
-I$(topsrcdir)/other-licenses/ply -I$(srcdir)/parser \
|
||||
$(srcdir)/BindingGen.py $(ACCESSOR_OPT) header $(srcdir)/Bindings.conf $*Binding \
|
||||
$(webidl_base)/$*.webidl
|
||||
$(PYTHON_PATH) \
|
||||
$(PLY_INCLUDE) -I$(srcdir)/parser \
|
||||
$(srcdir)/BindingGen.py $(ACCESSOR_OPT) header \
|
||||
$(srcdir)/Bindings.conf $*Binding \
|
||||
$(webidl_base)/$*.webidl
|
||||
|
||||
$(binding_cpp_files): %Binding.cpp: $(bindinggen_dependencies) \
|
||||
$(webidl_base)/%.webidl \
|
||||
$(NULL)
|
||||
$(PYTHON) $(topsrcdir)/config/pythonpath.py \
|
||||
-I$(topsrcdir)/other-licenses/ply -I$(srcdir)/parser \
|
||||
$(srcdir)/BindingGen.py $(ACCESSOR_OPT) cpp $(srcdir)/Bindings.conf $*Binding \
|
||||
$(webidl_base)/$*.webidl
|
||||
$(PYTHON_PATH) \
|
||||
$(PLY_INCLUDE) -I$(srcdir)/parser \
|
||||
$(srcdir)/BindingGen.py $(ACCESSOR_OPT) cpp \
|
||||
$(srcdir)/Bindings.conf $*Binding \
|
||||
$(webidl_base)/$*.webidl
|
||||
|
||||
$(globalgen_targets): ParserResults.pkl
|
||||
|
||||
|
@ -108,7 +110,7 @@ $(CACHE_DIR)/.done:
|
|||
ParserResults.pkl: $(globalgen_dependencies) \
|
||||
$(addprefix $(webidl_base)/, $(webidl_files))
|
||||
$(PYTHON) $(topsrcdir)/config/pythonpath.py \
|
||||
-I$(topsrcdir)/other-licenses/ply -I$(srcdir)/parser \
|
||||
$(PLY_INCLUDE) -I$(srcdir)/parser \
|
||||
$(srcdir)/GlobalGen.py $(ACCESSOR_OPT) $(srcdir)/Bindings.conf $(webidl_base) \
|
||||
--cachedir=$(CACHE_DIR) \
|
||||
$(webidl_files)
|
||||
|
|
|
@ -115,12 +115,12 @@ include $(topsrcdir)/config/rules.mk
|
|||
# NB: the IPDL compiler manages .ipdl-->.h/.cpp dependencies itself,
|
||||
# which is why we don't have explicit .h/.cpp targets here
|
||||
export:: $(ALL_IPDLSRCS)
|
||||
$(PYTHON) $(topsrcdir)/config/pythonpath.py \
|
||||
-I$(topsrcdir)/other-licenses/ply \
|
||||
$(srcdir)/ipdl.py \
|
||||
--outheaders-dir=_ipdlheaders \
|
||||
--outcpp-dir=. \
|
||||
$(IPDLDIRS:%=-I$(topsrcdir)/%) \
|
||||
$(PYTHON_PATH) \
|
||||
$(PLY_INCLUDE) \
|
||||
$(srcdir)/ipdl.py \
|
||||
--outheaders-dir=_ipdlheaders \
|
||||
--outcpp-dir=. \
|
||||
$(IPDLDIRS:%=-I$(topsrcdir)/%) \
|
||||
$^
|
||||
|
||||
# We #include some things in the dom/plugins/ directory that rely on
|
||||
|
|
|
@ -49,7 +49,7 @@ check::
|
|||
@$(PYTHON) $(srcdir)/runtests.py \
|
||||
$(srcdir)/ok $(srcdir)/error \
|
||||
$(PYTHON) $(topsrcdir)/config/pythonpath.py \
|
||||
-I$(topsrcdir)/other-licenses/ply \
|
||||
$(PLY_INCLUDE) \
|
||||
$(topsrcdir)/ipc/ipdl/ipdl.py \
|
||||
OKTESTS $(OKTESTS) \
|
||||
ERRORTESTS $(ERRORTESTS)
|
||||
|
|
|
@ -837,3 +837,8 @@ EXPAND_LIBNAME = $(foreach lib,$(1),$(LIB_PREFIX)$(lib).$(LIB_SUFFIX))
|
|||
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
|
||||
|
|
|
@ -1444,7 +1444,7 @@ xpidl-preqs = \
|
|||
$(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(xpidl-preqs)
|
||||
$(REPORT_BUILD)
|
||||
$(PYTHON_PATH) \
|
||||
-I$(topsrcdir)/other-licenses/ply \
|
||||
$(PLY_INCLUDE) \
|
||||
-I$(topsrcdir)/xpcom/idl-parser \
|
||||
$(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
|
||||
@if test -n "$(findstring $*.h, $(EXPORTS))"; \
|
||||
|
@ -1456,7 +1456,7 @@ ifndef NO_GEN_XPT
|
|||
$(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DEPS) $(xpidl-preqs)
|
||||
$(REPORT_BUILD)
|
||||
$(PYTHON_PATH) \
|
||||
-I$(topsrcdir)/other-licenses/ply \
|
||||
$(PLY_INCLUDE) \
|
||||
-I$(topsrcdir)/xpcom/idl-parser \
|
||||
-I$(topsrcdir)/xpcom/typelib/xpt/tools \
|
||||
$(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
|
||||
|
|
|
@ -150,8 +150,8 @@ dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \
|
|||
$(topsrcdir)/xpcom/idl-parser/header.py \
|
||||
$(topsrcdir)/xpcom/idl-parser/xpidl.py \
|
||||
$(DEPTH)/js/src/js-confdefs.h
|
||||
$(PYTHON) $(topsrcdir)/config/pythonpath.py \
|
||||
-I$(topsrcdir)/other-licenses/ply \
|
||||
$(PYTHON_PATH) \
|
||||
$(PLY_INCLUDE) \
|
||||
-I$(topsrcdir)/xpcom/idl-parser \
|
||||
$(srcdir)/qsgen.py \
|
||||
--idlpath=$(DEPTH)/dist/idl \
|
||||
|
@ -171,8 +171,8 @@ dombindings_gen.h: $(srcdir)/dombindings.conf \
|
|||
$(topsrcdir)/xpcom/idl-parser/header.py \
|
||||
$(topsrcdir)/xpcom/idl-parser/xpidl.py \
|
||||
$(DEPTH)/js/src/js-confdefs.h
|
||||
$(PYTHON) $(topsrcdir)/config/pythonpath.py \
|
||||
-I$(topsrcdir)/other-licenses/ply \
|
||||
$(PYTHON_PATH) \
|
||||
$(PLY_INCLUDE) \
|
||||
-I$(topsrcdir)/xpcom/idl-parser \
|
||||
$(srcdir)/dombindingsgen.py \
|
||||
--idlpath=$(DEPTH)/dist/idl \
|
||||
|
@ -188,8 +188,8 @@ dombindings_gen.cpp: $(srcdir)/dombindings.conf \
|
|||
$(topsrcdir)/xpcom/idl-parser/header.py \
|
||||
$(topsrcdir)/xpcom/idl-parser/xpidl.py \
|
||||
$(DEPTH)/js/src/js-confdefs.h
|
||||
$(PYTHON) $(topsrcdir)/config/pythonpath.py \
|
||||
-I$(topsrcdir)/other-licenses/ply \
|
||||
$(PYTHON_PATH) \
|
||||
$(PLY_INCLUDE) \
|
||||
-I$(topsrcdir)/xpcom/idl-parser \
|
||||
$(srcdir)/dombindingsgen.py \
|
||||
--idlpath=$(DEPTH)/dist/idl \
|
||||
|
@ -207,8 +207,8 @@ DictionaryHelpers.h: $(srcdir)/dictionary_helper_gen.conf \
|
|||
$(topsrcdir)/xpcom/idl-parser/header.py \
|
||||
$(topsrcdir)/xpcom/idl-parser/xpidl.py \
|
||||
$(DEPTH)/js/src/js-confdefs.h
|
||||
$(PYTHON) $(topsrcdir)/config/pythonpath.py \
|
||||
-I$(topsrcdir)/other-licenses/ply \
|
||||
$(PYTHON_PATH) \
|
||||
$(PLY_INCLUDE) \
|
||||
-I$(topsrcdir)/xpcom/idl-parser \
|
||||
$(srcdir)/dictionary_helper_gen.py \
|
||||
-I $(DEPTH)/dist/idl \
|
||||
|
@ -222,8 +222,8 @@ DictionaryHelpers.cpp: $(srcdir)/dictionary_helper_gen.conf \
|
|||
$(topsrcdir)/xpcom/idl-parser/header.py \
|
||||
$(topsrcdir)/xpcom/idl-parser/xpidl.py \
|
||||
$(DEPTH)/js/src/js-confdefs.h
|
||||
$(PYTHON) $(topsrcdir)/config/pythonpath.py \
|
||||
-I$(topsrcdir)/other-licenses/ply \
|
||||
$(PYTHON_PATH) \
|
||||
$(PLY_INCLUDE) \
|
||||
-I$(topsrcdir)/xpcom/idl-parser \
|
||||
$(srcdir)/dictionary_helper_gen.py \
|
||||
-I $(DEPTH)/dist/idl \
|
||||
|
|
|
@ -59,13 +59,13 @@ include $(topsrcdir)/config/rules.mk
|
|||
# Generate the PLY lexer and parser.
|
||||
export:: $(PARSER_SRCS) $(PLY_PROGS)
|
||||
$(PYTHON_PATH) \
|
||||
-I$(topsrcdir)/other-licenses/ply \
|
||||
$(PLY_INCLUDE) \
|
||||
-I$(topsrcdir)/xpcom/idl-parser \
|
||||
$(topsrcdir)/xpcom/idl-parser/header.py --cachedir=. --regen
|
||||
|
||||
check::
|
||||
$(PYTHON_PATH) \
|
||||
-I$(topsrcdir)/other-licenses/ply \
|
||||
$(PLY_INCLUDE) \
|
||||
-I$(topsrcdir)/xpcom/idl-parser \
|
||||
$(topsrcdir)/xpcom/idl-parser/runtests.py
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче