STUFF draft
authorTom Prince <mozilla@hocat.ca>
Fri, 15 Dec 2017 09:47:05 -0700
changeset 58511 9e55ca292976362a79c182b0454cb835758cfc5a
parent 58510 b25ef53db8a37278ae08e097ad99d7444f1a3e5f
child 58512 a04f34ef6b66d44ce146a380fa206b16e42b3b56
push id5846
push usermozilla@hocat.ca
push dateMon, 29 Jan 2018 05:34:40 +0000
treeherdertry-comm-central@ca5743879a91 [default view] [failures only]
STUFF
calendar/base/jar.mn
calendar/import-export/jar.mn
calendar/lightning/jar.mn
calendar/lightning/locales/jar.mn
calendar/locales/jar.mn
calendar/timezones/jar.mn
mail/locales/Makefile.in
mail/locales/l10n.toml
--- a/calendar/base/jar.mn
+++ b/calendar/base/jar.mn
@@ -1,14 +1,14 @@
 #filter substitution
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-calendar.jar:
+[extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}] calendar.jar:
 % resource calendar .
 % content calendar %content/calendar/
     content/calendar/agenda-listbox.js                     (content/agenda-listbox.js)
     content/calendar/agenda-listbox.xml                    (content/agenda-listbox.xml)
     content/calendar/calendar-bindings.css                 (content/calendar-bindings.css)
     content/calendar/calendar-calendars-list.xul           (content/calendar-calendars-list.xul)
     content/calendar/calendar-chrome-startup.js            (content/calendar-chrome-startup.js)
     content/calendar/calendar-clipboard.js                 (content/calendar-clipboard.js)
--- a/calendar/import-export/jar.mn
+++ b/calendar/import-export/jar.mn
@@ -1,5 +1,5 @@
 #filter substitution
-calendar.jar:
+[extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}] calendar.jar:
     ../skin/common/printing/calWeekPrinter.html             (calWeekPrinter.html)
     ../skin/common/printing/calMonthGridPrinter.html        (calMonthGridPrinter.html)
     ../skin/common/printing/calHtmlExport.html              (calHtmlExport.html)
--- a/calendar/lightning/jar.mn
+++ b/calendar/lightning/jar.mn
@@ -1,14 +1,14 @@
 #filter substitution
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-lightning.jar:
+[extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}] lightning.jar:
 % override chrome://messagebody/skin/imip.css chrome://lightning/skin/imip.css
 % override chrome://messagebody/skin/calendar-event-dialog-attendees.png chrome://calendar-common/skin/calendar-event-dialog-attendees.png
 % overlay chrome://messenger/content/messenger.xul chrome://lightning/content/lightning-migration.xul
 % overlay chrome://messenger/content/messenger.xul chrome://lightning/content/lightning-item-panel.xul
 % overlay chrome://messenger/content/msgAccountCentral.xul chrome://lightning/content/messenger-overlay-accountCentral.xul
 % overlay chrome://messenger/content/messenger.xul chrome://lightning/content/messenger-overlay-sidebar.xul
 % overlay chrome://messenger/content/messageWindow.xul chrome://lightning/content/imip-bar-overlay.xul
 % overlay chrome://messenger/content/messageWindow.xul chrome://lightning/content/messenger-overlay-messageWindow.xul
--- a/calendar/lightning/locales/jar.mn
+++ b/calendar/lightning/locales/jar.mn
@@ -1,11 +1,11 @@
 #filter substitution
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-lightning-@AB_CD@.jar:
+[extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}] lightning-@AB_CD@.jar:
 % locale lightning @AB_CD@ %locale/@AB_CD@/lightning/
   locale/@AB_CD@/lightning/lightning.dtd         (%chrome/lightning/lightning.dtd)
   locale/@AB_CD@/lightning/lightning-toolbar.dtd (%chrome/lightning/lightning-toolbar.dtd)
   locale/@AB_CD@/lightning/lightning.properties  (%chrome/lightning/lightning.properties)
--- a/calendar/locales/jar.mn
+++ b/calendar/locales/jar.mn
@@ -1,15 +1,15 @@
 #filter substitution
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-calendar-@AB_CD@.jar:
+[extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}] calendar-@AB_CD@.jar:
 % locale calendar @AB_CD@ %locale/@AB_CD@/calendar/
     locale/@AB_CD@/calendar/calendar.dtd                   (%chrome/calendar/calendar.dtd)
     locale/@AB_CD@/calendar/calendarCreation.dtd           (%chrome/calendar/calendarCreation.dtd)
     locale/@AB_CD@/calendar/calendarCreation.properties    (%chrome/calendar/calendarCreation.properties)
     locale/@AB_CD@/calendar/calendar.properties            (%chrome/calendar/calendar.properties)
     locale/@AB_CD@/calendar/calendar-alarms.properties     (%chrome/calendar/calendar-alarms.properties)
     locale/@AB_CD@/calendar/calendar-event-dialog.dtd      (%chrome/calendar/calendar-event-dialog.dtd)
     locale/@AB_CD@/calendar/calendar-event-dialog.properties  (%chrome/calendar/calendar-event-dialog.properties)
--- a/calendar/timezones/jar.mn
+++ b/calendar/timezones/jar.mn
@@ -1,10 +1,10 @@
 #filter substitution
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-locale.jar:
+[extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}] locale.jar:
 % locale calendar-timezones @AB_CD@ chrome/locale/@AB_CD@/
     @AB_CD@/timezones.properties (%chrome/calendar/timezones.properties)
 % resource calendar-timezones .
--- a/mail/locales/Makefile.in
+++ b/mail/locales/Makefile.in
@@ -77,25 +77,23 @@ searchplugins:: $(list-json)
 $(DIST)/branding:
 	$(NSINSTALL) -D $@
 
 libs-%: AB_CD=$*
 libs-%:
 # merge if we're not en-US. Conditional function because
 # we need the current value of AB_CD.
 	$(if $(filter en-US,$(AB_CD)),, @$(MAKE) merge-$*)
-ifdef MOZ_CALENDAR
-	$(if $(filter en-US,$(AB_CD)),, @$(MAKE) -C ../../calendar/lightning merge-$*)
-endif
 	$(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/shim/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-$*
+	@$(MAKE) -C ../../calendar/lightning/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(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: WIN32_INSTALLER_OUT=$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
 package-win32-installer: $(SUBMAKEFILES)
@@ -181,65 +179,23 @@ 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)' \
 	    ZIP_IN='$(ZIP_IN)' MOZ_SIMPLE_PACKAGE_NAME=
 	$(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/unpack.py $(DIST)/l10n-stage/$(MOZ_PKG_DIR)$(_RESPATH)
 	cd $(DIST)/l10n-stage && test $$(cat $(MOZ_PKG_DIR)$(_RESPATH)/update.locale) = x-test
 
-ifdef MOZ_CALENDAR
-LIGHTNING_PATH=$(commtopobjdir)/calendar/lightning
-GDATA_PATH=$(commtopobjdir)/calendar/providers/gdata
-
-define run-calendar-rule
-$(MAKE) -C $(LIGHTNING_PATH) $(subst calendar-,,$@) AB_CD=$(AB_CD)
-$(MAKE) -C $(GDATA_PATH) $(subst calendar-,,$@) AB_CD=$(AB_CD)
-endef
-
-# Add calendar targets for pattern rules. Unfortunately multiple pattern rules
-# on the left hand side do something different with make, therefore we need to
-# write a line for each target.
-calendar-clobber-%:
-	$(run-calendar-rule)
-calendar-langpack-%: AB_CD=$*
-calendar-langpack-%:
-	$(run-calendar-rule)
-calendar-repackage-zip-%: AB_CD=$*
-calendar-repackage-zip-%:
-	$(run-calendar-rule)
-calendar-wget-en-US:
-	$(run-calendar-rule)
-calendar-unpack:
-	$(run-calendar-rule)
-calendar-upload:
-	$(MAKE) -C $(LIGHTNING_PATH) upload AB_CD=$(AB_CD)
-
-# Hook into l10n.mk, providing extra arguments to l10n-repack.py
-ifdef NIGHTLY_BUILD
-MOZ_PKG_EXTRAL10N += extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}=$(DIST)/xpi-stage/lightning-$(AB_CD)
-else
-MOZ_PKG_EXTRAL10N += distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}=$(DIST)/xpi-stage/lightning-$(AB_CD)
-endif
-
-# Hook calendar targets to the mail non-pattern rules
-wget-en-US: calendar-wget-en-US
-unpack: calendar-unpack
-ifdef HACK_DISABLE
-upload: calendar-upload
-endif
-endif
-
 # This is a generic target that will make a langpack, repack ZIP (+tarball)
 # builds, and repack and installer if applicable. It is called from the
 # tinderbox scripts. Alter it with caution.
 installers-%: IS_LANGUAGE_REPACK=1
 installers-%:
 	@$(MAKE) clobber-$*
-ifdef MOZ_CALENDAR
+ifdef MOZ_CALENDAR_NO_BUILD
 	@$(MAKE) calendar-clobber-$*
 	@$(MAKE) calendar-langpack-$*
 	@$(MAKE) calendar-repackage-zip-$*
 endif
 	@$(MAKE) libs-$*
 	@$(MAKE) package-langpack-$*
 	@$(MAKE) repackage-zip-$*
 ifeq (WINNT,$(OS_ARCH))
--- a/mail/locales/l10n.toml
+++ b/mail/locales/l10n.toml
@@ -90,16 +90,19 @@ locales = [
     l10n = "{l}other-licenses/branding/thunderbird/**"
 
 [[includes]]
     path = "{mozilla}/devtools/client/locales/l10n.toml"
 
 [[includes]]
     path = "{mozilla}/toolkit/locales/l10n.toml"
 
+[[includes]]
+    path = "calendar/locales/l10n.toml"
+
 [[paths]]
     reference = "{mozilla}/devtools/shim/locales/en-US/**"
     l10n = "{l}/devtools/shim/**"
 
 # ignore MOZ_LANGPACK_CONTRIBUTORS
 [[filters]]
     path = "{l}mail/defines.inc"
     key = "MOZ_LANGPACK_CONTRIBUTORS"