Bug 1133428 - L10n repackages should survive searchplugins missing, even if listed in list.txt. r=KaiRo a=IanN in a CLOSED TREE
authorEdmund Wong <ewong@pw-wspx.org>
Sat, 21 Feb 2015 21:19:34 +0800
changeset 25668 9b5dc9623403c201f1c28e46d2efee2634f0fa96
parent 25663 72cd4a7406118d01b2329ed3bcb10a854363e505
child 25671 d181c2882739bcbdb51a368f52ad3a351dc37468
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersKaiRo, IanN
bugs1133428
Bug 1133428 - L10n repackages should survive searchplugins missing, even if listed in list.txt. r=KaiRo a=IanN in a CLOSED TREE
suite/locales/Makefile.in
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -111,18 +111,19 @@ libs:: $(FINAL_TARGET)/defaults/profile/
 libs:: $(FINAL_TARGET)/defaults/profile/panels.rdf ;
 
 libs:: $(addprefix generic/profile/,$(PROFILE_FILES))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile
 
 libs:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME)))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile/chrome
 
-SEARCH_PLUGINS = $(shell cat $(call MERGE_FILE,searchplugins/list.txt))
-
+SEARCH_PLUGINS_NAMES = $(shell cat $(call MERGE_FILE,searchplugins/list.txt))
+SEARCH_PLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCH_PLUGINS_NAMES)),$(or $(wildcard $(call MERGE_FILE,searchplugins/$(plugin))),$(info Missing searchplugin: $(plugin))))
+ 
 libs:: $(addsuffix .xml,$(SEARCH_PLUGINS))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/searchplugins
 
 # Extend l10n.mk clobber-% target for our localised extensions
 clobber-%:
 	$(RM) -rf $(DIST)/xpi-stage/chatzilla-$* $(DIST)/xpi-stage/chatzilla-*.$*.xpi
 
 libs-%: