Bug 1248246 - Replace GRE_BUILDID with MOZ_BUILDID, mail and calendar part. r=Fallen draft
authoraleth <aleth@instantbird.org>
Sun, 14 Feb 2016 14:18:59 +0100
changeset 35994 4e0d5013ab14975e0ca35d6bcc5c934f18e60088
parent 35990 7550f71d73835e7679e7f659c7efdc1df8af9151
child 35995 6f99d589c8de3d24c941b605de710bb006d790d9
child 35996 d839bd0f77899aabfcb1672f9b9fa1602e29d41c
push id3008
push useraleth@instantbird.org
push dateWed, 02 Mar 2016 11:48:36 +0000
treeherdertry-comm-central@6f99d589c8de [default view] [failures only]
reviewersFallen
bugs1248246
Bug 1248246 - Replace GRE_BUILDID with MOZ_BUILDID, mail and calendar part. r=Fallen
calendar/lightning/Makefile.in
calendar/lightning/app.ini
calendar/lightning/install.rdf
mail/app/Makefile.in
--- a/calendar/lightning/Makefile.in
+++ b/calendar/lightning/Makefile.in
@@ -82,18 +82,18 @@ DEFINES += -DTHUNDERBIRD_VERSION=$(THUND
            -DTHUNDERBIRD_MAXVERSION=$(THUNDERBIRD_MAXVERSION) \
            -DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) \
            -DSEAMONKEY_MAXVERSION=$(SEAMONKEY_MAXVERSION) \
            -DLIGHTNING_VERSION=$(LIGHTNING_VERSION) \
            -DTARGET_PLATFORM=$(OS_TARGET)_$(TARGET_XPCOM_ABI) \
            -DXPI_EM_ID="$(XPI_EM_ID)" \
            $(NULL)
 
-GRE_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID)
-DEFINES += -DGRE_BUILDID=$(GRE_BUILDID)
+MOZ_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID)
+DEFINES += -DMOZ_BUILDID=$(MOZ_BUILDID)
 
 include $(topsrcdir)/config/rules.mk
 include $(srcdir)/lightning-packager.mk
 include $(srcdir)/lightning-tests.mk
 
 # For Lightning, we also need to preprocess the l10n prefs. Pull in the en-US
 # copy if the files doesn't exist.
 repack-process-extrafiles: lightning-extrafiles
--- a/calendar/lightning/app.ini
+++ b/calendar/lightning/app.ini
@@ -5,17 +5,17 @@
 ; This is a mock application.ini for Lightning. It allows easy access to
 ; extension properties by the build system.
 
 #filter substitution
 [App]
 Vendor=Mozilla
 Name=Lightning
 Version=@LIGHTNING_VERSION@
-BuildID=@GRE_BUILDID@
+BuildID=@MOZ_BUILDID@
 
 #ifdef SOURCE_REPO
 SourceRepository=@SOURCE_REPO@
 #endif
 #ifdef SOURCE_STAMP
 SourceStamp=@SOURCE_STAMP@
 #endif
 
--- a/calendar/lightning/install.rdf
+++ b/calendar/lightning/install.rdf
@@ -26,25 +26,25 @@
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
         <em:minVersion>@SEAMONKEY_VERSION@</em:minVersion>
         <em:maxVersion>@SEAMONKEY_MAXVERSION@</em:maxVersion>
       </Description>
     </em:targetApplication>
 
     <em:id>@XPI_EM_ID@</em:id>
     <em:name>Lightning</em:name>
-    <em:version>@LIGHTNING_VERSION@</em:version> <!-- BuildID=@GRE_BUILDID@ -->
+    <em:version>@LIGHTNING_VERSION@</em:version> <!-- BuildID=@MOZ_BUILDID@ -->
     <em:description>An integrated calendar for Thunderbird</em:description>
 #ifdef LIGHTNING_PRERELEASE_VERSION
-    <em:developer>Build ID: @GRE_BUILDID@</em:developer>
+    <em:developer>Build ID: @MOZ_BUILDID@</em:developer>
 #endif
     <em:creator>Mozilla Calendar Project</em:creator>
     <em:homepageURL>https://www.mozilla.org/projects/calendar/</em:homepageURL>
     <em:iconURL>chrome://calendar/skin/cal-icon32.png</em:iconURL>
     <em:optionsURL>chrome://messenger/content/preferences/preferences.xul</em:optionsURL>
     <em:targetPlatform>@TARGET_PLATFORM@</em:targetPlatform>
 #ifdef LIGHTNING_UPDATE_LOCATION
-    <em:updateURL>@LIGHTNING_UPDATE_LOCATION@?buildID=@GRE_BUILDID@&amp;appABI=%APP_ABI%&amp;appOS=%APP_OS%&amp;locale=%APP_LOCALE%&amp;appVersion=%APP_VERSION%&amp;appID=%APP_ID%</em:updateURL>
+    <em:updateURL>@LIGHTNING_UPDATE_LOCATION@?buildID=@MOZ_BUILDID@&amp;appABI=%APP_ABI%&amp;appOS=%APP_OS%&amp;locale=%APP_LOCALE%&amp;appVersion=%APP_VERSION%&amp;appID=%APP_ID%</em:updateURL>
 #endif
     <em:unpack>true</em:unpack>
     <em:strictCompatibility>true</em:strictCompatibility>
   </Description>
 </RDF>
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -1,16 +1,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 AB_CD = $(MOZ_UI_LOCALE)
 
 GRE_MILESTONE = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build Milestone)
-GRE_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID)
+MOZ_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID)
 
 MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null))
 ifdef MOZ_SOURCE_STAMP
 DEFINES += -DMOZ_SOURCE_STAMP="$(MOZ_SOURCE_STAMP)"
 endif
 
 SOURCE_REPO := $(shell hg -R $(topsrcdir) showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/http:/")
 ifdef SOURCE_REPO