Bug 1065306 - Part 1: s/suggestedsites-json/suggestedsites/. r=mshal
☠☠ backed out by 1e2993c99323 ☠ ☠
authorNick Alexander <nalexander@mozilla.com>
Tue, 23 Sep 2014 09:52:44 -0700
changeset 206704 cc4d456a02e7470ce7087ca11f6abd7c8aa712c8
parent 206703 f0c025c53090a4f91d0215f86582f71a3295f4c4
child 206705 7a1c2d387052f215234bc0b5c2bf8d71769ddf46
push id8932
push usernalexander@mozilla.com
push dateTue, 23 Sep 2014 16:53:30 +0000
treeherderfx-team@c4ecd64d8b95 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1065306
milestone35.0a1
Bug 1065306 - Part 1: s/suggestedsites-json/suggestedsites/. r=mshal This is a mechanical change. In future, we will probably want to generate files not named like res/raw/file.json. I'm not going to handle res/not-raw right now; but I am going to handle not-file.json. This smoothes that path.
mobile/android/base/locales/Makefile.in
--- a/mobile/android/base/locales/Makefile.in
+++ b/mobile/android/base/locales/Makefile.in
@@ -23,26 +23,26 @@ endif
 $(warnIfEmpty,AB_CD) # todo: $(errorIfEmpty )
 
 dir-res-values := ../res/values
 strings-xml    := $(dir-res-values)/strings.xml
 strings-xml-in := $(srcdir)/../strings.xml.in
 
 GARBAGE += $(strings-xml)
 
-dir-res-raw         := ../res/raw
-suggestedsites-json := $(dir-res-raw)/suggestedsites.json
+dir-res-raw := ../res/raw
+suggestedsites := $(dir-res-raw)/suggestedsites.json
 
 GARBAGE += \
-  $(suggestedsites-json) \
+  $(suggestedsites) \
   $(NULL)
 
 libs realchrome:: \
   $(strings-xml) \
-  $(suggestedsites-json) \
+  $(suggestedsites) \
   $(NULL)
 
 chrome-%:: AB_CD=$*
 chrome-%::
 	@$(MAKE) \
 	  $(dir-res-values)-$(AB_rCD)/strings.xml \
 	  $(dir-res-raw)-$(AB_rCD)/suggestedsites.json \
 	  AB_CD=$*
@@ -93,21 +93,21 @@ strings-xml-preqs =\
 	  -DSEARCHSTRINGSPATH='$(SEARCHSTRINGSPATH)' \
       $< \
 	  -o $@)
 
 suggestedsites-srcdir := $(if $(filter en-US,$(AB_CD)),,$(or $(realpath $(L10NBASEDIR)),$(abspath $(L10NBASEDIR)))/$(AB_CD)/mobile/chrome)
 
 # Determine the ../res/raw[-*] path.  This can be ../res/raw when no
 # locale is explicitly specified.
-suggestedsites-json-bypath = $(filter %/suggestedsites.json,$(MAKECMDGOALS))
-ifeq (,$(strip $(suggestedsites-json-bypath)))
-  suggestedsites-json-bypath = $(suggestedsites-json)
+suggestedsites-bypath = $(filter %/suggestedsites.json,$(MAKECMDGOALS))
+ifeq (,$(strip $(suggestedsites-bypath)))
+  suggestedsites-bypath = $(suggestedsites)
 endif
-suggestedsites-dstdir-raw = $(patsubst %/,%,$(dir $(suggestedsites-json-bypath)))
+suggestedsites-dstdir-raw = $(patsubst %/,%,$(dir $(suggestedsites-bypath)))
 
 $(suggestedsites-dstdir-raw)/suggestedsites.json: FORCE
 	$(call py_action,generate_suggestedsites, \
 		--verbose \
 		--android-package-name=$(ANDROID_PACKAGE_NAME) \
 		--resources=$(srcdir)/../resources \
 		$(if $(filter en-US,$(AB_CD)),,--srcdir=$(suggestedsites-srcdir)) \
 		--srcdir=$(topsrcdir)/mobile/locales/en-US/chrome \