Run compare-locales using a hardcoded path to make builders happy a=release-bustage
authorPhilipp Kewisch <mozilla@kewis.ch>
Thu, 30 Apr 2015 21:52:46 +0200
changeset 22053 ce90a09fa0575b913c51c40c4fe1ae5f4061c942
parent 22050 207caead2e9430067d4d2bc60faf006ce158b2a0
child 22054 d9e17561056782d8e409a627e08ecbf4ae5a3a08
child 22056 f2c4bf11a49e85610d247edde8986e1c52e53af9
push id1368
push usermozilla@kewis.ch
push dateThu, 30 Apr 2015 19:54:25 +0000
treeherdercomm-beta@ce90a09fa057 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrelease-bustage
Run compare-locales using a hardcoded path to make builders happy a=release-bustage
calendar/lightning/lightning-packager.mk
--- a/calendar/lightning/lightning-packager.mk
+++ b/calendar/lightning/lightning-packager.mk
@@ -85,22 +85,28 @@ unpack: $(XPI_ZIP_IN)
 	$(NSINSTALL) -D $(XPI_STAGE_PATH)/$(XPI_NAME)
 	cd $(XPI_STAGE_PATH)/$(XPI_NAME) && $(UNZIP) $(XPI_ZIP_IN)
 	@echo done unpacking
 
 # Nothing to package for en-US, its just the usual english xpi
 langpack-en-US:
 	@echo "Skipping $@ as en-US is the default"
 
+# It wouldn't fit into mozharness to run compare-locales for calendar
+# separately, so we need to do it ourselves. Unfortunately compare-locales is
+# not installed globally on the slaves, so we need to hardcode the path.
+BUILD_COMPARE_LOCALES = $(wildcard $(topsrcdir)/../compare-locales/scripts/compare-locales)
+COMPARE_LOCALES = $(if $(BUILD_COMPARE_LOCALES),$(PYTHON) $(BUILD_COMPARE_LOCALES),compare-locales)
+
 merge-%:
 ifdef LOCALE_MERGEDIR
 	$(RM) -rf $(LOCALE_MERGEDIR)/calendar
-	MACOSX_DEPLOYMENT_TARGET= compare-locales -m $(LOCALE_MERGEDIR) $(topsrcdir)/calendar/locales/l10n.ini $(L10NBASEDIR) $*
+	MACOSX_DEPLOYMENT_TARGET= $(COMPARE_LOCALES) -m $(LOCALE_MERGEDIR) $(topsrcdir)/calendar/locales/l10n.ini $(L10NBASEDIR) $*
 
-	# This file requires a bugfix with string changes, see bug XXX
+	# This file requires a bugfix with string changes, see bug 1154448
 	[ -f $(L10NBASEDIR)/$*/calendar/chrome/calendar/calendar-extract.properties ] && \
 	  $(RM) $(LOCALE_MERGEDIR)/calendar/chrome/calendar/calendar-extract.properties \
 	  || true
 else
 	@echo "Not merging Lightning locales due to missing LOCALE_MERGEDIR"
 endif
 
 # Calling these targets with prerequisites causes the libs and subsequent