Bug 1265537 - Pass WIN32 Installer Filename to l10n-check explicitly, while simultaneously disabling MOZ_SIMPLE_PACKAGE_NAME. r=ted
This allows us to do l10n-check with a windows installer, with a simple named package as output by the build, without also overriding the en-US build with the x-test locale, while we're at it
MozReview-Commit-ID: CIxlOQA2oFu
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -185,14 +185,16 @@ endif
# test target, depends on make package
# try to repack x-test, with just toolkit/defines.inc being there
l10n-check:: INNER_UNMAKE_PACKAGE=true
l10n-check::
$(RM) -rf x-test
$(NSINSTALL) -D x-test/toolkit
echo '#define MOZ_LANG_TITLE Just testing' > x-test/toolkit/defines.inc
- @# ZIP_IN='$(ZIP_IN)' will pass down the *current* value of ZIP_IN, based
- @# on MOZ_SIMPLE_PACKAGE_NAME not being reset, overwriting the value it
- @# would get with MOZ_SIMPLE_PACKAGE_NAME reset.
- $(MAKE) installers-x-test L10NBASEDIR='$(PWD)' LOCALE_MERGEDIR='$(PWD)/mergedir' ZIP_IN='$(ZIP_IN)' MOZ_SIMPLE_PACKAGE_NAME=
+ @# ZIP_IN='$(ZIP_IN)' will pass down the *current* value of ZIP_IN, and
+ @# 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)' LOCALE_MERGEDIR='$(PWD)/mergedir' \
+ 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
