Bug 793628 - Produce Lightning Nightly builds during Thunderbird build process - Fix Mac Universal builds. r=Standard8

calendar/lightning/build/universal.mk

@@ -12,7 +12,15 @@ OBJDIR = $(OBJDIR_ARCH_1)
 endif
 
 topsrcdir = $(TOPSRCDIR)
-include $(OBJDIR)/config/autoconf.mk
+DEPTH = $(OBJDIR)
+
+include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/mozilla/toolkit/mozapps/installer/package-name.mk
+
+LIGHTNING_VERSION := $(shell cat $(topsrcdir)/calendar/sunbird/config/version.txt)
+XPI_PKGNAME = lightning-$(LIGHTNING_VERSION).$(AB_CD).$(MOZ_PKG_PLATFORM)
+
+include $(TOPSRCDIR)/config/config.mk
 
 postflight_all:
 	mkdir -p $(DIST_UNI)/xpi-stage
@@ -35,4 +43,4 @@ postflight_all:
 		$(DIST_ARCH_1)/xpi-stage/lightning \
 		$(DIST_ARCH_2)/xpi-stage/lightning \
 		> $(DIST_UNI)/xpi-stage/lightning/install.rdf
-	cd $(DIST_UNI)/xpi-stage/lightning && $(ZIP) -qr ../lightning.xpi *
+	cd $(DIST_UNI)/xpi-stage/lightning && $(ZIP) -qr ../$(XPI_PKGNAME).xpi *

calendar/lightning/lightning-packager.mk

@@ -129,7 +129,7 @@ recreate-platformini: $(LIBXUL_DIST)/bin/platform.ini
 
 stage_upload:
 	$(NSINSTALL) -D $(DIST)/$(MOZ_PKG_PLATFORM)
-	$(INSTALL) $(IFLAGS1) $(DIST)/xpi-stage/$(XPI_PKGNAME).xpi $(DIST)/$(MOZ_PKG_PLATFORM)
+	$(INSTALL) $(IFLAGS1) $(DIST)/$(UNIVERSAL_PATH)/xpi-stage/$(XPI_PKGNAME).xpi $(DIST)/$(MOZ_PKG_PLATFORM)
 	$(INSTALL) $(IFLAGS1) $(DIST)/xpi-stage/$(GDATA_XPI_PKGNAME).xpi $(DIST)/$(MOZ_PKG_PLATFORM)
 
 # Lightning uses Thunderbird's build machinery, so we need to hack the post

calendar/providers/gdata/universal.mk

@@ -1,17 +0,0 @@
-# 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/.
-
-ifndef OBJDIR
-OBJDIR_ARCH_1 = $(MOZ_OBJDIR)/$(firstword $(MOZ_BUILD_PROJECTS))
-OBJDIR_ARCH_2 = $(MOZ_OBJDIR)/$(word 2,$(MOZ_BUILD_PROJECTS))
-DIST_ARCH_1 = $(OBJDIR_ARCH_1)/mozilla/dist
-DIST_ARCH_2 = $(OBJDIR_ARCH_2)/mozilla/dist
-DIST_UNI = $(DIST_ARCH_1)/universal
-OBJDIR = $(OBJDIR_ARCH_1)
-endif
-
-# This is fine as long as the gdata provider has no binary components.
-postflight_all:
-	mkdir -p $(DIST_UNI)/xpi-stage
-	cp $(DIST_ARCH_1)/xpi-stage/gdata-provider.xpi $(DIST_UNI)/xpi-stage

mail/config/mozconfigs/macosx-universal/l10n-mozconfig

@@ -17,6 +17,9 @@ ac_add_options --enable-codesighs
 ac_add_options --disable-install-strip
 ac_add_options --enable-profiling
 
+# Make sure Lightning is also unified
+mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
+
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 

mail/config/mozconfigs/macosx-universal/nightly

@@ -28,6 +28,9 @@ export MOZILLA_OFFICIAL=1
 # Don't install Lightning into Thunderbird
 export DISABLE_LIGHTNING_INSTALL=1
 
+# Make sure Lightning is also unified
+mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
+
 # Enable parallel compiling
 CONCURRENCY=$(( `sysctl hw.logicalcpu | awk {'print $2'}`  + 2 ))
 mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"

mail/config/mozconfigs/macosx-universal/release

@@ -25,6 +25,9 @@ export MOZILLA_OFFICIAL=1
 # Don't install Lightning into Thunderbird
 export DISABLE_LIGHTNING_INSTALL=1
 
+# Make sure Lightning is also unified
+mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
+
 # Enable parallel compiling
 CONCURRENCY=$(( `sysctl hw.logicalcpu | awk {'print $2'}`  + 2 ))
 mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"