bug 1396177, unset MOZ_SIMPLE_PACKAGE_NAME for all of l10n-check, r?aki draft
authorAxel Hecht <axel@pike.org>
Mon, 04 Sep 2017 13:27:56 +0200
changeset 658706 03723966eda0ef2051242cead0581c440327a481
parent 658705 c4ecd43c17cc0f9250df2c098c20cf2f19e0250a
child 729725 de88440e4ce39db9583a0d844c5a15612face2ec
push id77843
push useraxel@mozilla.com
push dateMon, 04 Sep 2017 14:58:01 +0000
reviewersaki
bugs1396177
milestone57.0a1
bug 1396177, unset MOZ_SIMPLE_PACKAGE_NAME for all of l10n-check, r?aki MozReview-Commit-ID: 78MFJY6tvRW
browser/locales/Makefile.in
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -200,19 +200,19 @@ l10n-check::
 	@# we do the same for WIN32_INSTALLER_IN, which are based on MOZ_SIMPLE_PACKAGE_NAME
 	@# not being reset, overwriting the value they would get with MOZ_SIMPLE_PACKAGE_NAME
 	@# reset.
 	$(MAKE) installers-x-test L10NBASEDIR='$(PWD)' \
 	    ZIP_IN='$(ZIP_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
+	$(MAKE) package-langpack-x-test L10NBASEDIR='$(PWD)' WEBEXT_LANGPACKS=1 MOZ_SIMPLE_PACKAGE_NAME=
+	$(MAKE) analyze-langpack-x-test MOZ_SIMPLE_PACKAGE_NAME=
+	$(MAKE) check-clobber-l10n-x-test MOZ_SIMPLE_PACKAGE_NAME=
 
 # 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))