Bug 1457087 - disable l10n packaging for Calendar. rs=bustage-fix draft
authorJorg K <jorgk@jorgk.com>
Thu, 26 Apr 2018 17:16:48 +0200
changeset 60466 5c00bad2f27eccae1b6467b96bd6951cbdb69860
parent 60461 09853c5bacdb3f02e641e88fbab20c92bd574a90
child 60467 bf605ae613310ae8145ae5f5ed06988630b3746d
push id6156
push usermozilla@jorgk.com
push dateThu, 26 Apr 2018 15:17:18 +0000
treeherdertry-comm-central@bf605ae61331 [default view] [failures only]
reviewersbustage-fix
bugs1457087
Bug 1457087 - disable l10n packaging for Calendar. rs=bustage-fix
mail/locales/Makefile.in
mail/locales/l10n.toml
--- a/mail/locales/Makefile.in
+++ b/mail/locales/Makefile.in
@@ -89,17 +89,19 @@ libs-%:
 # we need the current value of AB_CD.
 	$(if $(filter en-US,$(AB_CD)),, @$(MAKE) merge-$*)
 	$(NSINSTALL) -D $(DIST)/install
 	@$(MAKE) -C $(DEPTH)/toolkit/locales libs-$*  XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
 	@$(MAKE) -C $(DEPTH)/devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
 	@$(MAKE) -C $(DEPTH)/devtools/startup/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
 	@$(MAKE) -C ../../chat/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C ../../editor/ui/locales AB_CD=$* XPI_NAME=locale-$*
+ifdef MOZ_CALENDAR
 	@$(MAKE) -C ../../calendar/locales AB_CD=$* XPI_NAME=locale-$*
+endif
 	@$(MAKE) -C $(DEPTH)/extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref
 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*
 
 
 package-win32-installer: $(SUBMAKEFILES)
 	$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen ZIP_IN='$(ZIP_OUT)' installer
--- a/mail/locales/l10n.toml
+++ b/mail/locales/l10n.toml
@@ -96,18 +96,20 @@ locales = [
     l10n = "{l}mail/branding/thunderbird/**"
 
 [[includes]]
     path = "{mozilla}/devtools/client/locales/l10n.toml"
 
 [[includes]]
     path = "{mozilla}/toolkit/locales/l10n.toml"
 
+ifdef MOZ_CALENDAR
 [[includes]]
     path = "calendar/locales/l10n.toml"
+endif
 
 [[paths]]
     reference = "{mozilla}/devtools/startup/locales/en-US/**"
     l10n = "{l}devtools/startup/**"
 
 # for Gecko 60 and older and cross-channel
 [[paths]]
     reference = "{mozilla}/devtools/shim/locales/en-US/**"