Fix lightning's upload target to work with a repack of all. a=Standard8 for checkin to relbranch only for testing COMM70_20110911_RELBRANCH
authorMark Banner <bugzilla@standard8.plus.com>
Thu, 22 Sep 2011 10:52:45 +0100
branchCOMM70_20110911_RELBRANCH
changeset 8489 6df1b859ad2ce1fa1a421d190256be5016afcf3c
parent 8488 ca168b187c2d1d213a40f928cb0d98451975e3ec
child 8490 4c23a29af74bc17d86dc1cab342a79d0dcc40357
push id149
push userbugzilla@standard8.plus.com
push dateThu, 22 Sep 2011 09:53:52 +0000
treeherdercomm-beta@4c23a29af74b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8
Fix lightning's upload target to work with a repack of all. a=Standard8 for checkin to relbranch only for testing
calendar/lightning/lightning-packager.mk
--- a/calendar/lightning/lightning-packager.mk
+++ b/calendar/lightning/lightning-packager.mk
@@ -137,23 +137,23 @@ 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)/$(MOZ_PKG_PLATFORM)/lightning.xpi \
-  $(DIST)/$(MOZ_PKG_PLATFORM)/gdata-provider.xpi \
+  lightning.xpi \
+  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/lightning-all.xpi $(DIST)/$(MOZ_PKG_PLATFORM)/lightning.xpi
 	$(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/lightning-all.xpi $(DIST)/$(MOZ_PKG_PLATFORM)/lightning.xpi
 	$(INSTALL) $(IFLAGS1) $(DIST)/xpi-stage/gdata-provider.xpi $(DIST)/$(MOZ_PKG_PLATFORM)
 endif
 	$(PYTHON) $(MOZILLA_DIR)/build/upload.py --base-path $(DIST) \
-	  $(UPLOAD_FILES)
+	  $(addprefix $(DIST)/$(MOZ_PKG_PLATFORM)/,$(basename $(UPLOAD_FILES)))