Bug 930976 Try and fix L10n repack bustage by ensuring that the Lightning xpi is actually built. r=Fallen,a=Standard8
authorMark Banner <bugzilla@standard8.plus.com>
Mon, 28 Oct 2013 12:21:03 +0000
changeset 16573 c43dd7dfaa8fb53c4244afc3937f05ab2be28c0f
parent 16572 c81d5f517a5fdc815d41ce749b6384d4a2b24726
child 16574 4585547772a0f2db95386737e355017830d23286
push id1020
push userbugzilla@standard8.plus.com
push dateTue, 29 Oct 2013 18:13:57 +0000
treeherdercomm-beta@c43dd7dfaa8f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersFallen, Standard8
bugs930976
Bug 930976 Try and fix L10n repack bustage by ensuring that the Lightning xpi is actually built. r=Fallen,a=Standard8
calendar/lightning/lightning-packager.mk
--- a/calendar/lightning/lightning-packager.mk
+++ b/calendar/lightning/lightning-packager.mk
@@ -140,16 +140,18 @@ langpack-all: recreate-platformini repac
 # Otherwise keep the original XPI_NAME
 # Overriding the final target is a bit of a hack for universal builds
 # so that we can ensure we get the right xpi that gets repacked.
 libs-%: FINAL_XPI_NAME=$(if $(L10N_XPI_NAME),$(L10N_XPI_NAME),$(XPI_NAME))
 libs-%: FINAL_XPI_PKGNAME=$(if $(L10N_XPI_PKGNAME),$(L10N_XPI_PKGNAME),$(XPI_PKGNAME))
 libs-%:
 	$(MAKE) -C locales libs AB_CD=$* FINAL_TARGET=$(_ABS_DIST)/$(UNIVERSAL_PATH)xpi-stage/$(FINAL_XPI_NAME) \
 	  XPI_NAME=$(FINAL_XPI_NAME) XPI_PKGNAME=$(FINAL_XPI_PKGNAME) USE_EXTENSION_MANIFEST=1
+	$(MAKE) -C locales tools AB_CD=$* FINAL_TARGET=$(_ABS_DIST)/$(UNIVERSAL_PATH)xpi-stage/$(FINAL_XPI_NAME) \
+	  XPI_NAME=$(FINAL_XPI_NAME) XPI_PKGNAME=$(FINAL_XPI_PKGNAME) USE_EXTENSION_MANIFEST=1
 
 # For localized xpis, the install.rdf need to be reprocessed with some defines
 # from the locale.
 repack-process-extrafiles: LOCALE_BASEDIR=$(call EXPAND_LOCALE_SRCDIR,calendar/locales)
 repack-process-extrafiles:
 	$(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py \
 	  $(XULAPP_DEFINES) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) \
 	  -I $(LOCALE_BASEDIR)/defines.inc \