Bug 1133428 - l10n repackages should survive searchplugins missing, even if listed in list.txt. r=ewong a=IanN on a CLOSED TREE
authorJustin Wood <Callek@gmail.com>
Thu, 26 Feb 2015 10:03:13 +0800
changeset 25682 f9af3f281b9568c088cbf2004b36a3bf4bf075f6
parent 25681 91029c9a2e4ed50452508205e50949081b2e9581
child 25683 b1a671eb4b4bfc5f91967646bfcd44f0b4271967
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)
reviewersewong, IanN
bugs1133428
Bug 1133428 - l10n repackages should survive searchplugins missing, even if listed in list.txt. r=ewong a=IanN on a CLOSED TREE
suite/locales/Makefile.in
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -57,16 +57,23 @@ endif
 NON_OMNIJAR_FILES = \
 	defaults/messenger/mailViews.dat \
 	defaults/profile/panels.rdf \
 	defaults/profile/mimeTypes.rdf \
 	defaults/profile/chrome/userChrome-example.css \
 	defaults/profile/chrome/userContent-example.css \
 	$(NULL)
 
+SEARCH_PLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt))
+SEARCH_PLUGINS_PATH := $(FINAL_TARGET)/searchplugins
+.PHONY: searchplugins
+SEARCH_PLUGINS_TARGET := libs searchplugins
+SEARCH_PLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCH_PLUGINS_NAMES)),$(or $(wildcard $(call MERGE_FILE,searchplugins/$(plugin))),$(info Missing searchplugin: $(plugin))))
+PP_TARGETS += SEARCH_PLUGINS
+
 include $(topsrcdir)/config/rules.mk
 
 include $(topsrcdir)/mozilla/toolkit/locales/l10n.mk
 
 $(STAGEDIST): $(DIST)/branding
 
 $(DIST)/branding:
 	$(NSINSTALL) -D $@
@@ -111,23 +118,16 @@ 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_NAMES = $(shell cat $(call MERGE_FILE,searchplugins/list.txt))
-SEARCH_PLUGINS_PATH := $(FINAL_TARGET)/searchplugins
-.PHONY: searchplugins
-SEARCH_PLUGINS_TARGET := libs searchplugins
-SEARCH_PLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCH_PLUGINS_NAMES)),$(or $(wildcard $(call MERGE_FILE,searchplugins/$(plugin))),$(info Missing searchplugin: $(plugin))))
-PP_TARGETS += SEARCH_PLUGINS
-
 # Extend l10n.mk clobber-% target for our localised extensions
 clobber-%:
 	$(RM) -rf $(DIST)/xpi-stage/chatzilla-$* $(DIST)/xpi-stage/chatzilla-*.$*.xpi
 
 libs-%:
 	$(NSINSTALL) -D $(DIST)/install
 	@$(MAKE) -C $(DEPTH)/toolkit/locales libs-$*
 	@$(MAKE) -C $(DEPTH)/services/sync/locales AB_CD=$* XPI_NAME=locale-$*