Backed out changeset 35e546b48807 (bug 1219122)
authorWes Kocher <wkocher@mozilla.com>
Fri, 30 Oct 2015 10:11:44 -0700
changeset 306445 9ee5987f194c076050a7b4a064f9cb70f0f23289
parent 306444 eb8cabe67114f36488c543521318b79fc0e01dc4
child 306446 9bd43c8ec7be51abb83bd43eba3a8b2ee7b5edf2
push id1040
push userraliiev@mozilla.com
push dateMon, 29 Feb 2016 17:11:22 +0000
treeherdermozilla-release@8c3167321162 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1219122
milestone45.0a1
backs out35e546b48807d934b8966719757df23162ef1af2
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
Backed out changeset 35e546b48807 (bug 1219122)
webapprt/Makefile.in
webapprt/application.ini.in
--- a/webapprt/Makefile.in
+++ b/webapprt/Makefile.in
@@ -5,18 +5,18 @@
 # Include config.mk explicitly so we can override FINAL_TARGET.
 include $(topsrcdir)/config/config.mk
 
 include $(topsrcdir)/config/rules.mk
 
 libs:: $(call mkdir_deps,$(FINAL_TARGET))
 	$(call py_action,buildlist,$(FINAL_TARGET)/chrome.manifest 'resource webapprt ./')
 
-MOZ_APP_BUILDID := $(shell cat $(DEPTH)/config/buildid)
-DEFINES += -DMOZ_APP_BUILDID=$(MOZ_APP_BUILDID)
+GRE_BUILDID := $(shell cat $(DEPTH)/config/buildid)
+DEFINES += -DGRE_BUILDID=$(GRE_BUILDID)
 
 webapprt.ini: application.ini.in $(DEPTH)/config/buildid $(topsrcdir)/config/milestone.txt
 	$(call py_action,preprocessor,$(DEFINES) $< -o $@)
 
 libs:: webapprt.ini
 	$(INSTALL) webapprt.ini $(FINAL_TARGET)
 
 GARBAGE += webapprt.ini
--- a/webapprt/application.ini.in
+++ b/webapprt/application.ini.in
@@ -9,20 +9,20 @@
 [App]
 ID=webapprt@mozilla.org
 Vendor=Mozilla
 ; Note: the Windows stub executable sets nsXREAppData::name to the webapp
 ; origin, overriding the value below, to make the app runner treat webapps
 ; as distinct products, per bug 747409.
 Name=Webapp Runtime
 Version=@GRE_MILESTONE@
-BuildID=@MOZ_APP_BUILDID@
+BuildID=@GRE_BUILDID@
 UAName=@MOZ_APP_BASENAME@
 
 [Gecko]
 MinVersion=@GRE_MILESTONE@
 MaxVersion=@GRE_MILESTONE@
 
 [Crash Reporter]
 #if MOZILLA_OFFICIAL
 Enabled=1
 #endif
-ServerURL=https://crash-reports.mozilla.com/submit?id=webapprt@mozilla.org&version=@GRE_MILESTONE@&buildid=@MOZ_APP_BUILDID@
+ServerURL=https://crash-reports.mozilla.com/submit?id=webapprt@mozilla.org&version=@GRE_MILESTONE@&buildid=@GRE_BUILDID@