Bug 1642630, explicitly copy l10n dictionaries to l10n merge dir, r=nalexander
authorAxel Hecht <axel@pike.org>
Thu, 04 Jun 2020 18:52:01 +0000
changeset 533963 fc754ed98c417ae5931e0a438487c52dea77d388
parent 533962 e485617bd678fad27fe51846ad885ed1246ac747
child 533964 a72c393582367227a55b1f25e53bcca369f773d4
push id37481
push userncsoregi@mozilla.com
push dateFri, 05 Jun 2020 04:39:26 +0000
treeherdermozilla-central@fecffba489bd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1642630
milestone79.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 1642630, explicitly copy l10n dictionaries to l10n merge dir, r=nalexander Hunspell dictionaries are interesting, as we don't ship the en-US dictionary in repacks. Thus we can't use the merge logic from compare-locales, which would add en-US.dic and en-US.aff to the merge directory. Copy them to the merge dir, if exist. The repackaged app can still decide on whether to package them or not in `libs-%` and `chrome-%`. Differential Revision: https://phabricator.services.mozilla.com/D77863
toolkit/locales/l10n.mk
--- a/toolkit/locales/l10n.mk
+++ b/toolkit/locales/l10n.mk
@@ -204,16 +204,26 @@ ifdef NIGHTLY_BUILD
 	if  ! test -d $(L10NBASEDIR)/$(AB_CD) ; then \
 		echo 'Checking out $(L10NBASEDIR)/$(AB_CD)' ; \
 		$(NSINSTALL) -D $(L10NBASEDIR) ; \
 		$(L10N_CO) ; \
 	fi
 endif
 	$(RM) -rf $(REAL_LOCALE_MERGEDIR)
 	-$(MOZILLA_DIR)/mach compare-locales --merge $(BASE_MERGE) $(srcdir)/l10n.toml $(L10NBASEDIR) $*
+# Hunspell dictionaries are interesting, as we don't ship the en-US
+# dictionary in repacks. Thus we can't use the merge logic from
+# compare-locales above, which would add en-US.dic and en-US.aff to
+# the merge directory.
+# Copy them to the merge dir, if exist. The repackaged app can still decide
+# on whether to package them or not in `libs-%` and `chrome-%`.
+	if  test -d $(L10NBASEDIR)/$(AB_CD)/extensions/spellcheck ; then \
+		$(NSINSTALL) -D $(REAL_LOCALE_MERGEDIR)/extensions/spellcheck/hunspell ; \
+		cp $(L10NBASEDIR)/$(AB_CD)/extensions/spellcheck/hunspell/*.* $(REAL_LOCALE_MERGEDIR)/extensions/spellcheck/hunspell ; \
+	fi
 
 langpack-%: IS_LANGUAGE_REPACK=1
 langpack-%: IS_LANGPACK=1
 langpack-%: AB_CD=$*
 langpack-%: clobber-%
 	@echo 'Making langpack $(LANGPACK_FILE)'
 	@$(MAKE) libs-$(AB_CD)
 	@$(MAKE) package-langpack-$(AB_CD)