Backout revision ec6c7dd9e25f (bug 1390461) for breaking Beta release automation.

MozReview-Commit-ID: CdPvaPuVGHE

--HG--
extra : rebase_source : 587ad51d0c37b1bb9e6261d9694cb87c078715d6
extra : histedit_source : 6f32c8a0ac853fad76c351dbb17402b36aacdcf8

browser/locales/Makefile.in

@@ -214,24 +214,4 @@ l10n-check::
 	$(MAKE) installers-x-test L10NBASEDIR='$(PWD)' \
 	    ZIP_IN='$(ZIP_IN)' WIN32_INSTALLER_IN='$(WIN32_INSTALLER_IN)' MOZ_SIMPLE_PACKAGE_NAME=
 	$(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/unpack.py $(DIST)/l10n-stage/$(MOZ_PKG_DIR)$(_RESPATH)
-	(cd $(DIST)/l10n-stage && test $$(cat $(MOZ_PKG_DIR)$(_RESPATH)/update.locale) = x-test)
-	@# package langpack as web extension, too, run some tests on it
-	$(MAKE) package-langpack-x-test L10NBASEDIR='$(PWD)' WEBEXT_LANGPACKS=1
-	$(MAKE) analyze-langpack-x-test
-	$(MAKE) check-clobber-l10n-x-test
-
-# Helper rules to have AB_CD set to the locale we test for testing
-# We need to split this out from l10n-check, as that needs AB_CD to be en-US
-# at the top level to unpack the right file
-analyze-langpack-%: AB_CD=$*
-analyze-langpack-%:
-	$(if $(shell unzip -qql $(ABS_DIST)/$(LANGPACK) manifest.json),$(info Found manifest.json),$(error manifest.json is missing))
-	$(if $(shell unzip -qql $(ABS_DIST)/$(LANGPACK) chrome.manifest),$(error Found chrome.manifest),$(info Not packaging chrome.manifest))
-
-check-clobber-l10n-%: AB_CD=$*
-check-clobber-l10n-%:
-	$(MAKE) clobber-x-test
-	$(RM) -r $(DIST)/l10n-stage $(DIST)/xpi-stage/locale-$(AB_CD)
-	$(RM) -r $(DIST)/*.$(AB_CD).*
-	$(RM) -r $(UNPACKED_INSTALLER) $(ABS_DIST)/$(LANGPACK)
-	$(RM) -rf $(DIST)/install/sea/*.$(AB_CD).*
+	cd $(DIST)/l10n-stage && test $$(cat $(MOZ_PKG_DIR)$(_RESPATH)/update.locale) = x-test

toolkit/locales/l10n.mk

@@ -215,14 +215,18 @@ langpack-%: IS_LANGPACK=1
 langpack-%: libs-%
 	@echo 'Making langpack $(LANGPACK_FILE)'
 	$(NSINSTALL) -D $(DIST)/$(PKG_LANGPACK_PATH)
-ifdef WEBEXT_LANGPACKS
-	$(call py_action,langpack_manifest,--locales $(AB_CD) --min-app-ver $(MOZ_APP_VERSION) --max-app-ver $(MOZ_APP_MAXVERSION) --app-name "$(MOZ_APP_DISPLAYNAME)" --defines $(NEW_APP_DEFINES) --input $(DIST)/xpi-stage/locale-$(AB_CD))
-	$(call py_action,zip,-C $(DIST)/xpi-stage/locale-$(AB_CD) -x **/*.manifest -x **/*.js -x **/*.ini $(LANGPACK_FILE) $(PKG_ZIP_DIRS) manifest.json)
-else
 	$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) \
 	  -DTK_DEFINES=$(TK_DEFINES) -DAPP_DEFINES=$(APP_DEFINES) $(MOZILLA_DIR)/toolkit/locales/generic/install.rdf -o $(DIST)/xpi-stage/$(XPI_NAME)/install.rdf)
 	$(call py_action,zip,-C $(DIST)/xpi-stage/locale-$(AB_CD) $(LANGPACK_FILE) install.rdf $(PKG_ZIP_DIRS) chrome.manifest)
-endif
+
+langpack-webext-%: LANGPACK_FILE=$(ABS_DIST)/$(PKG_LANGPACK_PATH)$(PKG_LANGPACK_BASENAME).xpi
+langpack-webext-%: AB_CD=$*
+langpack-webext-%: XPI_NAME=locale-$*
+langpack-webext-%: libs-%
+	@echo 'Making new-langpack $(LANGPACK_FILE)'
+	$(NSINSTALL) -D $(DIST)/$(PKG_LANGPACK_PATH)
+	$(call py_action,langpack_manifest,--locales $(AB_CD) --appver $(MOZ_APP_VERSION) --defines $(NEW_APP_DEFINES) --input $(DIST)/xpi-stage/locale-$(AB_CD))
+	$(call py_action,zip,-C $(DIST)/xpi-stage/locale-$(AB_CD) -x **/*.manifest -x **/*.js -x **/*.ini $(LANGPACK_FILE) $(PKG_ZIP_DIRS) manifest.json)
 
 # This variable is to allow the wget-en-US target to know which ftp server to download from
 ifndef EN_US_BINARY_URL