Bug 924995 - Use same base app name so that it uses the same profile and more. r=bbondy
authorMarina Samuel <msamuel@mozilla.com>
Tue, 19 Nov 2013 12:44:02 -0500
changeset 158060 f5eea4f293d30d152b8a8f872ebe34e9017ceddc
parent 158059 5a6373ab5fe6ae5b90ae00e1d277aa04ecc09498
child 158061 ccfc7f55f77604f47c9f9a4d6fa0e8321a96f5be
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersbbondy
bugs924995
milestone28.0a1
Bug 924995 - Use same base app name so that it uses the same profile and more. r=bbondy
browser/metro/Makefile.in
browser/metro/metroapp.ini.in
--- a/browser/metro/Makefile.in
+++ b/browser/metro/Makefile.in
@@ -3,17 +3,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include $(topsrcdir)/config/rules.mk
 
 #########################################
 # application.ini
 
 GRE_BUILDID := $(shell cat $(DEPTH)/config/buildid)
-DEFINES += -DGRE_BUILDID=$(GRE_BUILDID)
+DEFINES += -DGRE_BUILDID=$(GRE_BUILDID) -DMOZ_APP_BASENAME=$(MOZ_APP_BASENAME)
 
 # 'application.ini' breaks firefox build config. So we use something different.
 metroapp.ini: metroapp.ini.in $(DEPTH)/config/buildid $(topsrcdir)/config/milestone.txt
 	$(RM) "metroapp.ini"
 	$(call py_action,preprocessor,$(DEFINES) $< -o $@)
 
 libs:: metroapp.ini
 	$(INSTALL) metroapp.ini $(FINAL_TARGET)
--- a/browser/metro/metroapp.ini.in
+++ b/browser/metro/metroapp.ini.in
@@ -1,12 +1,12 @@
 #filter substitution
 [App]
 Vendor=Mozilla
-Name=MetroFirefox
+Name=@MOZ_APP_BASENAME@
 UAName=Firefox
 Version=@GRE_MILESTONE@
 BuildID=@GRE_BUILDID@
 ID={99bceaaa-e3c6-48c1-b981-ef9b46b67d60}
 
 [Gecko]
 MinVersion=@GRE_MILESTONE@
 MaxVersion=@GRE_MILESTONE@