bug 1237678, use in-tree compare-locales in Makefiles, r?gps
Also fix that the default merge dir in the mach command creates a directory
that's the merge make target, and thus keeps that make target from actually
running.
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -197,17 +197,17 @@ ident:
$(STAGEDIST)/application.ini App SourceStamp
@printf 'buildid '
@$(PYTHON) $(topsrcdir)/config/printconfigsetting.py \
$(STAGEDIST)/application.ini App BuildID
merge-%:
ifdef LOCALE_MERGEDIR
$(RM) -rf $(LOCALE_MERGEDIR)
- MACOSX_DEPLOYMENT_TARGET= compare-locales -m $(LOCALE_MERGEDIR) $(srcdir)/l10n.ini $(L10NBASEDIR) $*
+ $(topsrcdir)/mach compare-locales --merge-dir $(LOCALE_MERGEDIR) $*
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
--- a/mobile/android/locales/Makefile.in
+++ b/mobile/android/locales/Makefile.in
@@ -77,11 +77,11 @@ ident:
@printf 'fennec_revision '
@$(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(FENNEC_APPLICATION_INI_PATH) App SourceStamp
@printf 'buildid '
@$(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(FENNEC_APPLICATION_INI_PATH) App BuildID
merge-%:
ifdef LOCALE_MERGEDIR
$(RM) -rf $(LOCALE_MERGEDIR)
- MACOSX_DEPLOYMENT_TARGET= compare-locales -m $(LOCALE_MERGEDIR) $(srcdir)/l10n.ini $(L10NBASEDIR) $*
+ $(topsrcdir)/mach compare-locales --merge-dir $(LOCALE_MERGEDIR) $*
endif
@echo
--- a/python/compare-locales/mach_commands.py
+++ b/python/compare-locales/mach_commands.py
@@ -65,17 +65,17 @@ class CompareLocales(MachCommandBase):
if not merge_dir:
try:
# self.substs is raising an Exception if we're not configured
# don't merge if we're not
merge_dir = mozpath.join(
self.topobjdir,
self.substs['MOZ_BUILD_APP'],
- 'locales', 'merge-{ab_CD}'
+ 'locales', 'merge-dir-{ab_CD}'
)
except Exception:
pass
app = EnumerateApp(l10n_ini, l10n_base, locales)
observer = compareApp(app, merge_stage=merge_dir,
clobber=True)
print(observer.serialize().encode('utf-8', 'replace'))