Bug 1621633 - make ./mach fluent-migration-test work for Thunderbird. r=Pike
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Wed, 29 Apr 2020 19:09:55 +0300
changeset 38077 025fbcb6dbdf3d549c385d40401cb0cacda97b50
parent 38076 7853102282e6bc50b8a2317e86b5185b0c5c250d
child 38078 53466469a60fab29ce4322f7716b5e42ec56a18c
push id2595
push userclokep@gmail.com
push dateMon, 04 May 2020 19:02:04 +0000
treeherdercomm-beta@f53913797371 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersPike
bugs1621633
Bug 1621633 - make ./mach fluent-migration-test work for Thunderbird. r=Pike
mail/locales/Makefile.in
mail/locales/l10n.toml
suite/locales/Makefile.in
suite/locales/l10n.toml
--- a/mail/locales/Makefile.in
+++ b/mail/locales/Makefile.in
@@ -51,20 +51,16 @@ MOZ_INSTALLER_PATH=$(commtopsrcdir)/mail
 NON_OMNIJAR_FILES = defaults/messenger/mailViews.dat
 
 # Required for l10n.mk - defines a list of app sub dirs that should
 # be included in langpack xpis.
 DIST_SUBDIRS = $(DIST_SUBDIR)
 
 include $(moztopsrcdir)/config/rules.mk
 
-ifeq ($(commreltopsrcdir),comm)
-COMPARE_LOCALES_DEFINES += -Dmozilla=..
-endif
-
 include $(moztopsrcdir)/toolkit/locales/l10n.mk
 
 $(DIST)/branding:
 	$(NSINSTALL) -D $@
 
 libs-%: AB_CD=$*
 libs-%:
 # merge if we're not en-US. Conditional function because
--- a/mail/locales/l10n.toml
+++ b/mail/locales/l10n.toml
@@ -68,17 +68,17 @@ locales = [
     "uz",
     "vi",
     "zh-CN",
     "zh-TW",
 ]
 
 [env]
     l = "{l10n_base}/{locale}/"
-    mozilla = "mozilla"
+    mozilla = ".."
 
 
 [[paths]]
     reference = "mail/locales/en-US/**"
     l10n = "{l}mail/**"
 
 [[paths]]
     reference = "chat/locales/en-US/**"
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -69,18 +69,16 @@ libs:: searchplugins
 
 # Required for l10n.mk - defines a list of app sub dirs that should
 # be included in langpack xpis.
 # Currently not set in SeaMonkey.
 DIST_SUBDIRS = $(DIST_SUBDIR)
 
 include $(topsrcdir)/config/rules.mk
 
-COMPARE_LOCALES_DEFINES += -Dmozilla=..
-
 include $(topsrcdir)/toolkit/locales/l10n.mk
 
 $(list-txt): $(call mkdir_deps,$(SEARCHPLUGINS_PATH)) $(if $(IS_LANGUAGE_REPACK),FORCE)
 	$(RM) $(list-txt)
 	$(foreach plugin,$(SEARCHPLUGINS_NAMES),printf '$(plugin)\n' >> $(list-txt);)
 searchplugins:: $(list-txt)
 
 $(DIST)/branding:
--- a/suite/locales/l10n.toml
+++ b/suite/locales/l10n.toml
@@ -32,17 +32,17 @@ locales = [
     "sv-SE",
     "tr",
     "zh-CN",
     "zh-TW",
 ]
 
 [env]
     l = "{l10n_base}/{locale}/"
-    mozilla = "mozilla"
+    mozilla = ".."
 
 [[paths]]
     reference = "suite/locales/en-US/**"
     l10n = "{l}suite/**"
 
 [[paths]]
     reference = "editor/ui/locales/en-US/**"
     l10n = "{l}editor/ui/**"