Run compare-locales using a hardcoded path to make builders happy a=release-bustage
authorPhilipp Kewisch <mozilla@kewis.ch>
Fri, 01 May 2015 09:10:37 +0200
changeset 25906 f2c4bf11a49e85610d247edde8986e1c52e53af9
parent 25903 ce90a09fa0575b913c51c40c4fe1ae5f4061c942
child 25907 afd563aaf3c6a53d31633d5015d4b06a8e1294d7
child 25909 bee77485f1bf2e3c447487831bd8ddf2c4f087a3
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [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
@@ -88,23 +88,25 @@ unpack: $(XPI_ZIP_IN)
 
 # 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)
+BUILD_COMPARE_LOCALES = $(wildcard $(topsrcdir)/../compare-locales)
+COMPARE_LOCALES = $(if $(BUILD_COMPARE_LOCALES),$(PYTHON) $(BUILD_COMPARE_LOCALES)/scripts/compare-locales,compare-locales)
+COMPARE_LOCALES_PYTHONPATH = $(if $(BUILD_COMPARE_LOCALES),$(BUILD_COMPARE_LOCALES)/lib,)
 
 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= PYTHONPATH=$(COMPARE_LOCALES_PYTHONPATH) \
+	  $(COMPARE_LOCALES) -m $(LOCALE_MERGEDIR) $(topsrcdir)/calendar/locales/l10n.ini $(L10NBASEDIR) $*
 
 	# 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