Bug 1445582 - error out when the searchplugins list is empty or a plugin is missing draft
authorJulien Cristau <jcristau@mozilla.com>
Wed, 14 Mar 2018 10:39:36 +0100
changeset 767360 17b3700aee6cd79e626cc1ba6a1dfeb3a3f210ca
parent 767163 c56ef1c14a555023949ad727c86e3c2df995edd2
push id102571
push userjcristau@mozilla.com
push dateWed, 14 Mar 2018 13:01:36 +0000
bugs1445582
milestone61.0a1
Bug 1445582 - error out when the searchplugins list is empty or a plugin is missing MozReview-Commit-ID: DCUEc526d8D
browser/locales/Makefile.in
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -31,20 +31,20 @@ MOZ_PKG_MAC_DSSTORE=$(ABS_DIST)/branding
 MOZ_PKG_MAC_BACKGROUND=$(ABS_DIST)/branding/background.png
 MOZ_PKG_MAC_ICON=$(ABS_DIST)/branding/disk.icns
 MOZ_PKG_MAC_EXTRA=--symlink '/Applications:/ '
 endif
 
 MOZ_SFX_PACKAGE=$(topsrcdir)/other-licenses/7zstub/firefox/7zSD.sfx
 MOZ_INSTALLER_PATH=$(topsrcdir)/browser/installer/windows
 
-SEARCHPLUGINS_FILENAMES := $(shell $(call py_action,output_searchplugins_list,$(srcdir)/search/list.json $(AB_CD)))
+SEARCHPLUGINS_FILENAMES := $(or $(shell $(call py_action,output_searchplugins_list,$(srcdir)/search/list.json $(AB_CD))), $(error Missing search plugins))
 SEARCHPLUGINS_PATH := .deps/generated_$(AB_CD)
 SEARCHPLUGINS_TARGET := libs searchplugins
-SEARCHPLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCHPLUGINS_FILENAMES)),$(or $(wildcard $(srcdir)/searchplugins/$(plugin)),$(warning Missing searchplugin: $(plugin))))
+SEARCHPLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCHPLUGINS_FILENAMES)),$(or $(wildcard $(srcdir)/searchplugins/$(plugin)),$(error 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
 PP_TARGETS += SEARCHPLUGINS
 
 list-json = $(SEARCHPLUGINS_PATH)/list.json
 GARBAGE += $(list-json)