Part of bug 658133. Fix the make upload target for Mac. Landing on relbranch only for test with release builds. a=Standard8 COMM70_20110911_RELBRANCH
authorMark Banner <bugzilla@standard8.plus.com>
Wed, 14 Sep 2011 12:25:23 -0700
branchCOMM70_20110911_RELBRANCH
changeset 8457 43011b973467688e82e4df9f7ab46a9977e0ff5c
parent 8455 87ce4421d8f845c229fca01b15ded81ebf615653
child 8458 aa39967c4ace4e4018134125a198477f2f2ce9b4
push id129
push userbugzilla@standard8.plus.com
push dateWed, 14 Sep 2011 19:25:48 +0000
treeherdercomm-beta@aa39967c4ace [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8
bugs658133
Part of bug 658133. Fix the make upload target for Mac. Landing on relbranch only for test with release builds. a=Standard8
calendar/lightning/lightning-packager.mk
--- a/calendar/lightning/lightning-packager.mk
+++ b/calendar/lightning/lightning-packager.mk
@@ -143,12 +143,17 @@ recreate-platformini: $(LIBXUL_DIST)/bin
 
 UPLOAD_FILES = \
   $(DIST)/$(MOZ_PKG_PLATFORM)/lightning.xpi \
   $(DIST)/$(MOZ_PKG_PLATFORM)/gdata-provider.xpi \
   $(NULL)
 
 upload:
 	$(NSINSTALL) -D $(DIST)/$(MOZ_PKG_PLATFORM)
+ifdef UNIVERSAL_BINARY
+	$(INSTALL) $(IFLAGS1) $(DIST)/universal/xpi-stage/lightning.xpi $(DIST)/$(MOZ_PKG_PLATFORM)
+	$(INSTALL) $(IFLAGS1) $(DIST)/universal/xpi-stage/gdata-provider.xpi $(DIST)/$(MOZ_PKG_PLATFORM)
+else
 	$(INSTALL) $(IFLAGS1) $(DIST)/xpi-stage/lightning.xpi $(DIST)/$(MOZ_PKG_PLATFORM)
 	$(INSTALL) $(IFLAGS1) $(DIST)/xpi-stage/gdata-provider.xpi $(DIST)/$(MOZ_PKG_PLATFORM)
+endif
 	$(PYTHON) $(MOZILLA_DIR)/build/upload.py --base-path $(DIST) \
 	  $(UPLOAD_FILES)