Bug 696122 - L10n files (lightning-AB-CD.jar) missing in Lightning 1.0rc builds. r+a=Fallen CAL80_20111019_RELBRANCH
authorMark Banner <bugzilla@standard8.plus.com>
Mon, 24 Oct 2011 11:33:17 +0100
branchCAL80_20111019_RELBRANCH
changeset 8937 ad00c4c24d9ce23e706202abeb6aa5d7291aa667
parent 8932 0af8673cb43d98f1bd529de190e21081ba7482a6
child 8939 3fb36da0ee0f4a2a3efb25656b5873d5f0e7511b
push id196
push userbugzilla@standard8.plus.com
push dateMon, 24 Oct 2011 10:34:06 +0000
treeherdercomm-beta@aef75ee47407 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs696122
Bug 696122 - L10n files (lightning-AB-CD.jar) missing in Lightning 1.0rc builds. r+a=Fallen
calendar/lightning/lightning-packager.mk
--- a/calendar/lightning/lightning-packager.mk
+++ b/calendar/lightning/lightning-packager.mk
@@ -120,21 +120,23 @@ repack-l10n-all: repack-clobber-all $(ad
 
 # Helper target to align names better to targets from other locale Makefiles
 repack-l10n-%:
 	$(MAKE) AB_CD=$* repack-l10n
 
 # Actual locale packaging targets. If L10N_XPI_NAME is set, then use it.
 # 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
+# so that we can ensure we get the right xpi that gets repacked.
+# The ../ is added to dist because calendar/lightning/locales is at a different level
+# to this makefile.
 libs-%: FINAL_XPI_NAME=$(if $(L10N_XPI_NAME),$(L10N_XPI_NAME),$(XPI_NAME))
 libs-%:
-	$(MAKE) -C locales libs AB_CD=$* FINAL_TARGET=$(DIST)/$(UNIVERSAL_PATH)xpi-stage/$(FINAL_XPI_NAME) XPI_NAME=$(FINAL_XPI_NAME) XPI_PKGNAME=$(FINAL_XPI_NAME) USE_EXTENSION_MANIFEST=1
-	$(MAKE) -C ../locales libs AB_CD=$* FINAL_TARGET=$(DIST)/$(UNIVERSAL_PATH)xpi-stage/$(FINAL_XPI_NAME) XPI_NAME=$(FINAL_XPI_NAME) XPI_PKGNAME=$(FINAL_XPI_NAME) USE_EXTENSION_MANIFEST=1
+	$(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_NAME) USE_EXTENSION_MANIFEST=1
+	$(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_NAME) USE_EXTENSION_MANIFEST=1
 
 # For localized xpis, the install.rdf and lightning-l10n.js 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 $(srcdir)/install.rdf > $(DIST)/$(UNIVERSAL_PATH)xpi-stage/$(L10N_XPI_NAME)/install.rdf
 	$(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $(LOCALE_BASEDIR)/lightning-l10n.js  > $(DIST)/$(UNIVERSAL_PATH)xpi-stage/$(L10N_XPI_NAME)/$(PREF_DIR)/lightning-l10n.js