зеркало из https://github.com/mozilla/gecko-dev.git
Bug 891474 - Establish unified directory for Python build actions; r=glandium, ted
--HG-- rename : config/purge_directories.py => python/mozbuild/mozbuild/action/purge_manifests.py rename : build/xpccheck.py => python/mozbuild/mozbuild/action/xpccheck.py extra : rebase_source : 46bc960aa62c1117a7bf215653b768dc78b48d9a
This commit is contained in:
Родитель
4de38c183f
Коммит
329e5f905d
|
@ -60,7 +60,7 @@ ifndef MOZ_PROFILE_USE
|
|||
# We need to explicitly put backend.RecursiveMakeBackend.built here
|
||||
# otherwise the rule in rules.mk doesn't run early enough.
|
||||
default alldep all:: CLOBBER $(topsrcdir)/configure config.status backend.RecursiveMakeBackend.built
|
||||
$(PYTHON) $(topsrcdir)/config/purge_directories.py -d _build_manifests/purge .
|
||||
$(call py_action,purge_manifests,-d _build_manifests/purge .)
|
||||
endif
|
||||
|
||||
CLOBBER: $(topsrcdir)/CLOBBER
|
||||
|
|
|
@ -813,3 +813,11 @@ MOZ_GTK2_CFLAGS := -I$(topsrcdir)/widget/gtk2/compat $(MOZ_GTK2_CFLAGS)
|
|||
endif
|
||||
|
||||
DEFINES += -DNO_NSPR_10_SUPPORT
|
||||
|
||||
# Run a named Python build action. The first argument is the name of the build
|
||||
# action. The second argument are the arguments to pass to the action (space
|
||||
# delimited arguments). e.g.
|
||||
#
|
||||
# libs::
|
||||
# $(call py_action,purge_manifests,_build_manifests/purge/foo.manifest)
|
||||
py_action = $(PYTHON) -m mozbuild.action.$(1) $(2)
|
||||
|
|
|
@ -29,9 +29,7 @@ libs:: libs-xpcshell-tests
|
|||
libs-xpcshell-tests:
|
||||
$(foreach dir,$(XPCSHELL_TESTS),$(_INSTALL_TESTS))
|
||||
ifndef NO_XPCSHELL_MANIFEST_CHECK #{
|
||||
$(PYTHON) $(MOZILLA_DIR)/build/xpccheck.py \
|
||||
$(topsrcdir) \
|
||||
$(addprefix $(MOZILLA_DIR)/$(relativesrcdir)/,$(XPCSHELL_TESTS))
|
||||
$(call py_action,xpccheck,$(topsrcdir) $(addprefix $(MOZILLA_DIR)/$(relativesrcdir)/,$(XPCSHELL_TESTS)))
|
||||
endif #} NO_XPCSHELL_MANIFEST_CHECK
|
||||
|
||||
###########################################################################
|
||||
|
|
|
@ -813,3 +813,11 @@ MOZ_GTK2_CFLAGS := -I$(topsrcdir)/widget/gtk2/compat $(MOZ_GTK2_CFLAGS)
|
|||
endif
|
||||
|
||||
DEFINES += -DNO_NSPR_10_SUPPORT
|
||||
|
||||
# Run a named Python build action. The first argument is the name of the build
|
||||
# action. The second argument are the arguments to pass to the action (space
|
||||
# delimited arguments). e.g.
|
||||
#
|
||||
# libs::
|
||||
# $(call py_action,purge_manifests,_build_manifests/purge/foo.manifest)
|
||||
py_action = $(PYTHON) -m mozbuild.action.$(1) $(2)
|
||||
|
|
|
@ -29,9 +29,7 @@ libs:: libs-xpcshell-tests
|
|||
libs-xpcshell-tests:
|
||||
$(foreach dir,$(XPCSHELL_TESTS),$(_INSTALL_TESTS))
|
||||
ifndef NO_XPCSHELL_MANIFEST_CHECK #{
|
||||
$(PYTHON) $(MOZILLA_DIR)/build/xpccheck.py \
|
||||
$(topsrcdir) \
|
||||
$(addprefix $(MOZILLA_DIR)/$(relativesrcdir)/,$(XPCSHELL_TESTS))
|
||||
$(call py_action,xpccheck,$(topsrcdir) $(addprefix $(MOZILLA_DIR)/$(relativesrcdir)/,$(XPCSHELL_TESTS)))
|
||||
endif #} NO_XPCSHELL_MANIFEST_CHECK
|
||||
|
||||
###########################################################################
|
||||
|
|
Загрузка…
Ссылка в новой задаче