Part of bug 685133. Specify a make upload target for lightning attempt 2. Landing on relbranch only for test with release builds purposes. a=Standard8 COMM70_20110911_RELBRANCH CALENDAR_1_0b6_BUILD3
authorMark Banner <bugzilla@standard8.plus.com>
Tue, 13 Sep 2011 10:58:25 -0700
branchCOMM70_20110911_RELBRANCH
changeset 8453 690cde88f0874e3f23b4a774d07d8718fca33963
parent 8451 edf211b2c78c4e44705cb3355269fa11d60d7cab
child 8454 f3e30253046c25a5a347072c7154558fbc403d60
push id126
push userbugzilla@standard8.plus.com
push dateTue, 13 Sep 2011 17:58:40 +0000
treeherdercomm-beta@690cde88f087 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8
bugs685133
Part of bug 685133. Specify a make upload target for lightning attempt 2. Landing on relbranch only for test with release builds purposes. a=Standard8
calendar/lightning/lightning-packager.mk
--- a/calendar/lightning/lightning-packager.mk
+++ b/calendar/lightning/lightning-packager.mk
@@ -137,15 +137,18 @@ repack-process-extrafiles:
 	 $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(DIST)/xpi-stage/$(XPI_NAME)/application.ini Build SourceRepository >> $(LIBXUL_DIST)/bin/platform.ini
 	 
 	 echo -n "BuildID=" >> $(LIBXUL_DIST)/bin/platform.ini
 	 $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(DIST)/xpi-stage/$(XPI_NAME)/application.ini App BuildID >> $(LIBXUL_DIST)/bin/platform.ini
 
 recreate-platformini: $(LIBXUL_DIST)/bin/platform.ini
 
 UPLOAD_FILES = \
-  $(DIST)/xpi-stage/lightning.xpi \
-  $(DIST)/xpi-stage/gdata-provider.xpi \
+  $(DIST)/$(MOZ_PKG_PLATFORM)/lightning.xpi \
+  $(DIST)/$(MOZ_PKG_PLATFORM)/gdata-provider.xpi \
   $(NULL)
 
 upload:
-	$(PYTHON) $(MOZILLA_DIR)/build/upload.py \
-          $(UPLOAD_FILES)
+	$(NSINSTALL) -D $(DIST)/$(MOZ_PKG_PLATFORM)
+	$(INSTALL) $(IFLAGS1) $(DIST)/xpi-stage/lightning.xpi $(DIST)/$(MOZ_PKG_PLATFORM)
+	$(INSTALL) $(IFLAGS1) $(DIST)/xpi-stage/gdata-provider.xpi $(DIST)/$(MOZ_PKG_PLATFORM)
+	$(PYTHON) $(MOZILLA_DIR)/build/upload.py --base-path $(DIST) \
+	  $(UPLOAD_FILES)