bug 1396177, unset MOZ_SIMPLE_PACKAGE_NAME for all of l10n-check, r=aki
authorAxel Hecht <axel@pike.org>
Mon, 04 Sep 2017 13:27:56 +0200
changeset 428281 d3021ff5ea6ae59624c5559be2e357a61da1b774
parent 428280 6211693ad32cc7ecc3a580e9c9939c001896567d
child 428282 a2f3c1a002b3f206f812a73e1845f57d5b517fcb
push id7761
push userjlund@mozilla.com
push dateFri, 15 Sep 2017 00:19:52 +0000
treeherdermozilla-beta@c38455951db4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaki
bugs1396177
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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))