Bug 790655 - Ensure update.locale is correct when running l10n-check. r=ted
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 20 Sep 2012 19:36:08 +0200
changeset 107634 2fead827aff0f4774d7ae5f51bb67fb91a8d6c69
parent 107633 b7a70792a39d5fc023fd1bde84eec7031547f89a
child 107635 5543e5e5bcd3bf0eef53d6c97c1e023b9cb87b51
push id15143
push usermh@glandium.org
push dateThu, 20 Sep 2012 17:38:21 +0000
treeherdermozilla-inbound@5543e5e5bcd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs790655
milestone18.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 790655 - Ensure update.locale is correct when running l10n-check. r=ted
browser/locales/Makefile.in
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -231,13 +231,16 @@ merge-%:
 ifdef LOCALE_MERGEDIR
 	$(RM) -rf $(LOCALE_MERGEDIR)
 	MACOSX_DEPLOYMENT_TARGET= compare-locales -m $(LOCALE_MERGEDIR) $(srcdir)/l10n.ini $(L10NBASEDIR) $*
 endif
 	@echo
 
 # 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
 	$(MAKE) installers-x-test L10NBASEDIR="$(PWD)" LOCALE_MERGEDIR="$(PWD)/mergedir"
+	cd $(DIST)/l10n-stage && $(UNMAKE_PACKAGE)
+	cd $(DIST)/l10n-stage && test $$(cat $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/update.locale) = x-test