Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 12:25:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1219122 - Use MOZ_APP_BUILDID instead of GRE_BUILDID for webapprt.ini. r=mshal

Browse Source 
This adds consistency with e.g. application.ini, and will make the FasterMake
backend happier once webapprt.ini moves to moz.build.
This commit is contained in:
Mike Hommey 2015-10-28 14:02:41 +09:00
parent 03e573e93c
commit c6c94e9247
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webapprt/Makefile.in
View File

@ -10,8 +10,8 @@ include $(topsrcdir)/config/rules.mk
libs:: $(call mkdir_deps,$(FINAL_TARGET))
$(call py_action,buildlist,$(FINAL_TARGET)/chrome.manifest 'resource webapprt ./')
GRE_BUILDID := $(shell cat $(DEPTH)/config/buildid)
DEFINES += -DGRE_BUILDID=$(GRE_BUILDID)
MOZ_APP_BUILDID := $(shell cat $(DEPTH)/config/buildid)
DEFINES += -DMOZ_APP_BUILDID=$(MOZ_APP_BUILDID)
webapprt.ini: application.ini.in $(DEPTH)/config/buildid $(topsrcdir)/config/milestone.txt
$(call py_action,preprocessor,$(DEFINES) $< -o $@)

4
webapprt/application.ini.in
View File

@ -14,7 +14,7 @@ Vendor=Mozilla
; as distinct products, per bug 747409.
Name=Webapp Runtime
Version=@GRE_MILESTONE@
BuildID=@GRE_BUILDID@
BuildID=@MOZ_APP_BUILDID@
UAName=@MOZ_APP_BASENAME@
[Gecko]
@ -25,4 +25,4 @@ MaxVersion=@GRE_MILESTONE@
#if MOZILLA_OFFICIAL
Enabled=1
#endif
ServerURL=https://crash-reports.mozilla.com/submit?id=webapprt@mozilla.org&version=@GRE_MILESTONE@&buildid=@GRE_BUILDID@
ServerURL=https://crash-reports.mozilla.com/submit?id=webapprt@mozilla.org&version=@GRE_MILESTONE@&buildid=@MOZ_APP_BUILDID@