Bug 1426083 - Support spaces when dealing with multilocale.json r=gps
authorSylvestre Ledru <sledru@mozilla.com>
Tue, 19 Dec 2017 11:22:57 +0100
changeset 448623 ff1a826ff6095b925662bbde44956a94d0757a5e
parent 448622 c74685e570c20efe8f3d36355a7c5c30540aabac
child 448624 efee3a8c1124c6e622c12d13f0f36bfdfbbc36dc
push id8527
push userCallek@gmail.com
push dateThu, 11 Jan 2018 21:05:50 +0000
treeherdermozilla-beta@95342d212a7a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1426083
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1426083 - Support spaces when dealing with multilocale.json r=gps MozReview-Commit-ID: Io4fRdcOd1j
toolkit/mozapps/installer/packager.mk
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -201,24 +201,24 @@ else
 BASE_PATH:=@RESPATH@
 MULTILOCALE_DIR = $(DIST)/$(RESPATH)/res
 endif
 
 # This version of the target uses MOZ_CHROME_MULTILOCALE to build multilocale.json
 # and places it in dist/bin/res - it should be used when packaging a build.
 multilocale.json: LOCALES?=$(MOZ_CHROME_MULTILOCALE)
 multilocale.json:
-	$(call py_action,file_generate,$(MOZILLA_DIR)/toolkit/locales/gen_multilocale.py main $(MULTILOCALE_DIR)/multilocale.json $(MDDEPDIR)/multilocale.json.pp $(ALL_LOCALES))
+	$(call py_action,file_generate,$(MOZILLA_DIR)/toolkit/locales/gen_multilocale.py main '$(MULTILOCALE_DIR)/multilocale.json' $(MDDEPDIR)/multilocale.json.pp $(ALL_LOCALES))
 
 # This version of the target uses AB_CD to build multilocale.json and places it
 # in the $(XPI_NAME)/res dir - it should be used when repackaging a build.
 multilocale.json-%: LOCALES?=$(AB_CD)
 multilocale.json-%: MULTILOCALE_DIR=$(DIST)/xpi-stage/$(XPI_NAME)/res
 multilocale.json-%:
-	$(call py_action,file_generate,$(MOZILLA_DIR)/toolkit/locales/gen_multilocale.py main $(MULTILOCALE_DIR)/multilocale.json $(MDDEPDIR)/multilocale.json.pp $(ALL_LOCALES))
+	$(call py_action,file_generate,$(MOZILLA_DIR)/toolkit/locales/gen_multilocale.py main '$(MULTILOCALE_DIR)/multilocale.json' $(MDDEPDIR)/multilocale.json.pp $(ALL_LOCALES))
 
 locale-manifest.in: LOCALES?=$(MOZ_CHROME_MULTILOCALE)
 locale-manifest.in: $(GLOBAL_DEPS) FORCE
 	printf '\n[multilocale]\n' > $@
 	printf '$(BASE_PATH)/res/multilocale.json\n' >> $@
 	for LOCALE in $(ALL_LOCALES) ;\
 	do \
 	  for ENTRY in $(MOZ_CHROME_LOCALE_ENTRIES) ;\