зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1111607 - Searchplugins should be picked up from en-US, if possible. r=glandium
--HG-- extra : transplant_source : %C9%23%D72%E7%EF%88%C8%1F%CFa_%1E%9B%0Cf%22%A0%BFu
This commit is contained in:
Родитель
a62bb17df4
Коммит
09d0025de0
|
@ -77,7 +77,7 @@ SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins
|
|||
# metro build call a searchplugins target for search engine plugins
|
||||
.PHONY: searchplugins
|
||||
SEARCHPLUGINS_TARGET := libs searchplugins
|
||||
SEARCHPLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCHPLUGINS_NAMES)),$(or $(wildcard $(call MERGE_FILE,searchplugins/$(plugin))),$(info Missing searchplugin: $(plugin))))
|
||||
SEARCHPLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCHPLUGINS_NAMES)),$(or $(wildcard $(call EN_US_OR_L10N_FILE,searchplugins/$(plugin))),$(info Missing searchplugin: $(plugin))))
|
||||
# Some locale-specific search plugins may have preprocessor directives, but the
|
||||
# default en-US ones do not.
|
||||
SEARCHPLUGINS_FLAGS := --silence-missing-directive-warnings
|
||||
|
|
|
@ -614,6 +614,13 @@ MERGE_FILE = $(LOCALE_SRCDIR)/$(1)
|
|||
endif
|
||||
MERGE_FILES = $(foreach f,$(1),$(call MERGE_FILE,$(f)))
|
||||
|
||||
# These marcros are similar to MERGE_FILE, but no merging, and en-US first.
|
||||
# They're used for searchplugins, for example.
|
||||
EN_US_OR_L10N_FILE = $(firstword \
|
||||
$(wildcard $(srcdir)/en-US/$(1)) \
|
||||
$(LOCALE_SRCDIR)/$(1) )
|
||||
EN_US_OR_L10N_FILES = $(foreach f,$(1),$(call EN_US_OR_L10N_FILE,$(f)))
|
||||
|
||||
ifneq (WINNT,$(OS_ARCH))
|
||||
RUN_TEST_PROGRAM = $(LIBXUL_DIST)/bin/run-mozilla.sh
|
||||
endif # ! WINNT
|
||||
|
|
Загрузка…
Ссылка в новой задаче