Bug 516026 - Integrate Lightning Into SeaMonkey by Default and Ship SeaMonkey with Lightning Enabled - Part1. r=IanN, a=IanN
authorAdrian Kalla <akalla@aviary.pl>
Tue, 05 Apr 2016 14:41:45 +0200
changeset 27017 4945fda6470c311f63760e45f67fc7cf61e3c257
parent 27016 304b2fd17d04908f358cdd36d2827ba408895d5a
child 27018 407f0aca9e05f9a7e0ec6b3066067cf01fb45ef1
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersIanN, IanN
bugs516026
Bug 516026 - Integrate Lightning Into SeaMonkey by Default and Ship SeaMonkey with Lightning Enabled - Part1. r=IanN, a=IanN
suite/installer/Makefile.in
suite/installer/package-manifest.in
suite/locales/Makefile.in
--- a/suite/installer/Makefile.in
+++ b/suite/installer/Makefile.in
@@ -37,16 +37,24 @@ DEFINES += -DMOZ_ANGLE_RENDERER=$(MOZ_AN
 ifdef MOZ_D3DCOMPILER_VISTA_DLL
 DEFINES += -DMOZ_D3DCOMPILER_VISTA_DLL=$(MOZ_D3DCOMPILER_VISTA_DLL)
 endif
 ifdef MOZ_D3DCOMPILER_XP_DLL
 DEFINES += -DMOZ_D3DCOMPILER_XP_DLL=$(MOZ_D3DCOMPILER_XP_DLL)
 endif
 endif
 
+ifdef NIGHTLY_BUILD
+DEFINES += -DNIGHTLY_BUILD=1
+endif
+
+ifdef MOZ_CALENDAR
+DEFINES += -DMOZ_CALENDAR=1
+endif
+
 ifdef MOZ_DEBUG
 DEFINES += -DMOZ_DEBUG=1
 endif
 
 ifdef MOZ_ENABLE_GNOME_COMPONENT
 DEFINES += -DMOZ_ENABLE_GNOME_COMPONENT=1
 endif
 
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -956,8 +956,17 @@ bin/libfreebl_32int64_3.so
 #ifdef MOZ_OMNIJAR
 @RESPATH@/distribution/extensions/debugQA@mozilla.org.xpi
 #else
 @RESPATH@/extensions/debugQA@mozilla.org/install.rdf
 @RESPATH@/extensions/debugQA@mozilla.org/chrome.manifest
 @RESPATH@/extensions/debugQA@mozilla.org/chrome/debugqa@JAREXT@
 #endif
 #endif
+
+#ifdef MOZ_CALENDAR
+[calendar]
+#ifdef NIGHTLY_BUILD
+@RESPATH@/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/
+#else
+@RESPATH@/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/
+#endif
+#endif
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -170,23 +170,16 @@ ifdef MOZ_OMNIJAR
 	$(MAKE) -C ../app pack-ext AB_CD=$(AB_CD) STAGEDIST=$(STAGEDIST)/distribution/extensions;
 endif
 
 repackage-zip-%: $(call ESCAPE_WILDCARD,$(ZIP_IN)) $(STAGEDIST) libs-%
 	@$(MAKE) repackage-zip AB_CD=$* ZIP_IN=$(ZIP_IN)
 
 langpack: langpack-$(AB_CD)
 
-# This is a generic target that will make a langpack, repack ZIP (+tarball)
-# builds, and repack an installer if applicable. It is called from the
-# tinderbox scripts. Alter it with caution.
-
-installers-%: clobber-% langpack-% repackage-win32-installer-% repackage-zip-%
-	@echo 'repackaging done'
-
 ifdef MOZ_UPDATER
 libs:: $(addprefix $(LOCALE_SRCDIR)/,updater/updater.ini)
 ifeq ($(OS_ARCH),WINNT)
 	cat $< $(srcdir)/../installer/windows/nsis/updater_append.ini | \
 	  sed -e 's/^InfoText=/Info=/' -e 's/^TitleText=/Title=/' | \
 	  sed -e 's/%MOZ_APP_DISPLAYNAME%/$(MOZ_APP_DISPLAYNAME)/' > \
 	  $(FINAL_TARGET)/updater.ini
 else
@@ -216,8 +209,58 @@ ident:
 merge-%:
 ifdef LOCALE_MERGEDIR
 	$(RM) -rf $(LOCALE_MERGEDIR)
 	MACOSX_DEPLOYMENT_TARGET= compare-locales -m $(LOCALE_MERGEDIR) $(srcdir)/l10n.ini $(L10NBASEDIR) $*
 endif
 	@echo
 
 .PHONY: repackage-extensions
+
+ifdef MOZ_CALENDAR
+LIGHTNING_PATH=$(DEPTH)/calendar/lightning
+GDATA_PATH=$(DEPTH)/calendar/providers/gdata
+
+define run-calendar-rule
+$(MAKE) -C $(LIGHTNING_PATH) LOCALE_MERGEDIR=$(LOCALE_MERGEDIR) $(subst calendar-,,$@)
+$(MAKE) -C $(GDATA_PATH) LOCALE_MERGEDIR=$(LOCALE_MERGEDIR) $(subst calendar-,,$@)
+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-merge-%:
+	$(run-calendar-rule)
+calendar-clobber-%:
+	$(run-calendar-rule)
+calendar-langpack-%:
+	$(run-calendar-rule)
+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
+upload: calendar-upload
+
+# Hook into the pattern rules, this will be used later on in the installers-% target.
+CALENDAR_INSTALLERS_TARGETS = calendar-merge-% calendar-clobber-% calendar-langpack-% calendar-repackage-zip-%
+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_TARGETS = clobber-% $(CALENDAR_INSTALLERS_TARGETS) langpack-% repackage-win32-installer-% repackage-zip-%
+installers-%: $(INSTALLERS_TARGETS)
+	@echo 'repackaging done'