Bug 1176533 - Rename the variable MOZ_APP_VERSION_ABOUT for something more general r=glandium

--HG--
rename : browser/config/version_about.txt => browser/config/version_display.txt

browser/base/content/aboutDialog.xul

@@ -42,7 +42,7 @@
     <hbox id="clientBox">
       <vbox id="leftBox" flex="1"/>
       <vbox id="rightBox" flex="1">
-#expand <label id="version">__MOZ_APP_VERSION_ABOUT__</label>
+#expand <label id="version">__MOZ_APP_VERSION_DISPLAY__</label>
         <label id="distribution" class="text-blurb"/>
         <label id="distributionId" class="text-blurb"/>
 

browser/base/moz.build

@@ -25,7 +25,7 @@ BROWSER_CHROME_MANIFESTS += [
 ]
 
 DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
-DEFINES['MOZ_APP_VERSION_ABOUT'] = CONFIG['MOZ_APP_VERSION_ABOUT']
+DEFINES['MOZ_APP_VERSION_DISPLAY'] = CONFIG['MOZ_APP_VERSION_DISPLAY']
 
 DEFINES['APP_LICENSE_BLOCK'] = '%s/content/overrides/app-license.html' % SRCDIR
 

browser/confvars.sh

@@ -38,7 +38,7 @@ MOZ_SERVICES_METRICS=1
 MOZ_SERVICES_SYNC=1
 MOZ_SERVICES_CLOUDSYNC=1
 MOZ_APP_VERSION=$FIREFOX_VERSION
-MOZ_APP_VERSION_ABOUT=$FIREFOX_VERSION_ABOUT
+MOZ_APP_VERSION_DISPLAY=$FIREFOX_VERSION_DISPLAY
 MOZ_EXTENSIONS_DEFAULT=" gio"
 # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
 # MOZ_BRANDING_DIRECTORY is the default branding directory used when none is

client.mk

@@ -311,7 +311,7 @@ CONFIG_STATUS_DEPS := \
   $(TOPSRCDIR)/nsprpub/configure \
   $(TOPSRCDIR)/config/milestone.txt \
   $(TOPSRCDIR)/browser/config/version.txt \
-  $(TOPSRCDIR)/browser/config/version_about.txt \
+  $(TOPSRCDIR)/browser/config/version_display.txt \
   $(TOPSRCDIR)/build/virtualenv_packages.txt \
   $(TOPSRCDIR)/python/mozbuild/mozbuild/virtualenv.py \
   $(TOPSRCDIR)/testing/mozbase/packages.txt \

configure.in

@@ -1959,14 +1959,14 @@ MOZILLA_SYMBOLVERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --t
 
 dnl Get version of various core apps from the version files.
 FIREFOX_VERSION=`cat $_topsrcdir/browser/config/version.txt`
-FIREFOX_VERSION_ABOUT=`cat $_topsrcdir/browser/config/version_about.txt`
+FIREFOX_VERSION_DISPLAY=`cat $_topsrcdir/browser/config/version_display.txt`
 
 if test -z "$FIREFOX_VERSION"; then
     AC_MSG_ERROR([FIREFOX_VERSION is unexpectedly blank.])
 fi
 
-if test -z "$FIREFOX_VERSION_ABOUT"; then
-    AC_MSG_ERROR([FIREFOX_VERSION_ABOUT is unexpectedly blank.])
+if test -z "$FIREFOX_VERSION_DISPLAY"; then
+    AC_MSG_ERROR([FIREFOX_VERSION_DISPLAY is unexpectedly blank.])
 fi
 
 AC_DEFINE_UNQUOTED(MOZILLA_VERSION,"$MOZILLA_VERSION")
@@ -8760,7 +8760,7 @@ AC_SUBST(MOZ_CHILD_PROCESS_BUNDLE)
 # Mac Bundle name, Updater, Installer), it is typically used for nightly
 # builds (e.g. Aurora for Firefox).
 # - MOZ_APP_VERSION: Defines the application version number.
-# - MOZ_APP_VERSION_ABOUT: Defines the application version number. Used
+# - MOZ_APP_VERSION_DISPLAY: Defines the application version number. Used
 # in the "About" window. If not set, defaults to MOZ_APP_VERSION.
 # - MOZ_APP_NAME: Used for e.g. the binary program file name. If not set,
 # defaults to a lowercase form of MOZ_APP_BASENAME.
@@ -8780,8 +8780,8 @@ if test -z "$MOZ_APP_REMOTINGNAME"; then
    MOZ_APP_REMOTINGNAME=$MOZ_APP_NAME
 fi
 
-if test -z "$MOZ_APP_VERSION_ABOUT"; then
-   MOZ_APP_VERSION_ABOUT=$MOZ_APP_VERSION
+if test -z "$MOZ_APP_VERSION_DISPLAY"; then
+   MOZ_APP_VERSION_DISPLAY=$MOZ_APP_VERSION
 fi
 
 # For extensions and langpacks, we require a max version that is compatible
@@ -8820,7 +8820,7 @@ AC_DEFINE_UNQUOTED(MOZ_APP_UA_NAME, "$MOZ_APP_UA_NAME")
 AC_SUBST(MOZ_APP_UA_NAME)
 AC_DEFINE_UNQUOTED(MOZ_APP_UA_VERSION, "$MOZ_APP_VERSION")
 AC_SUBST(MOZ_APP_VERSION)
-AC_SUBST(MOZ_APP_VERSION_ABOUT)
+AC_SUBST(MOZ_APP_VERSION_DISPLAY)
 AC_SUBST(MOZ_APP_MAXVERSION)
 AC_DEFINE_UNQUOTED(FIREFOX_VERSION,$FIREFOX_VERSION)
 AC_SUBST(FIREFOX_VERSION)

mobile/android/chrome/content/about.js

@@ -9,7 +9,7 @@ Cu.import("resource://gre/modules/Services.jsm");
 function init() {
   // Include the build date and a warning about Telemetry
   // if this is an "a#" (nightly or aurora) build
-#expand const version = "__MOZ_APP_VERSION_ABOUT__";
+#expand const version = "__MOZ_APP_VERSION_DISPLAY__";
   if (/a\d+$/.test(version)) {
     let buildID = Services.appinfo.appBuildID;
     let buildDate = buildID.slice(0, 4) + "-" + buildID.slice(4, 6) + "-" + buildID.slice(6, 8);

mobile/android/chrome/content/about.xhtml

@@ -24,7 +24,7 @@
 <body dir="&locale.dir;">
   <div id="header">
     <div id="wordmark"></div>
-#expand <p id="version">__MOZ_APP_VERSION_ABOUT__</p>
+#expand <p id="version">__MOZ_APP_VERSION_DISPLAY__</p>
   </div>
 
   <div id="banner">

mobile/android/chrome/moz.build

@@ -7,7 +7,7 @@
 DEFINES['AB_CD'] = CONFIG['MOZ_UI_LOCALE']
 DEFINES['PACKAGE'] = 'browser'
 DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
-DEFINES['MOZ_APP_VERSION_ABOUT'] = CONFIG['MOZ_APP_VERSION_ABOUT']
+DEFINES['MOZ_APP_VERSION_DISPLAY'] = CONFIG['MOZ_APP_VERSION_DISPLAY']
 DEFINES['ANDROID_PACKAGE_NAME'] = CONFIG['ANDROID_PACKAGE_NAME']
 
 JAR_MANIFESTS += ['jar.mn']

toolkit/content/aboutSupport.js

@@ -38,7 +38,7 @@ let snapshotFormatters = {
     $("application-box").textContent = data.name;
     $("useragent-box").textContent = data.userAgent;
     $("supportLink").href = data.supportURL;
-    let version = AppConstants.MOZ_APP_VERSION_ABOUT;
+    let version = AppConstants.MOZ_APP_VERSION_DISPLAY;
     if (data.vendor)
       version += " (" + data.vendor + ")";
     $("version-box").textContent = version;

toolkit/modules/AppConstants.jsm

@@ -172,7 +172,7 @@ this.AppConstants = Object.freeze({
 
   MOZ_APP_NAME: "@MOZ_APP_NAME@",
   MOZ_APP_VERSION: "@MOZ_APP_VERSION@",
-  MOZ_APP_VERSION_ABOUT: "@MOZ_APP_VERSION_ABOUT@",
+  MOZ_APP_VERSION_DISPLAY: "@MOZ_APP_VERSION_DISPLAY@",
   MOZ_BUILD_APP: "@MOZ_BUILD_APP@",
   MOZ_UPDATE_CHANNEL: "@MOZ_UPDATE_CHANNEL@",
   MOZ_WIDGET_TOOLKIT: "@MOZ_WIDGET_TOOLKIT@",

toolkit/modules/Troubleshoot.jsm

@@ -172,7 +172,7 @@ let dataProviders = {
   application: function application(done) {
     let data = {
       name: Services.appinfo.name,
-      version: AppConstants.MOZ_APP_VERSION_ABOUT,
+      version: AppConstants.MOZ_APP_VERSION_DISPLAY,
       buildID: Services.appinfo.appBuildID,
       userAgent: Cc["@mozilla.org/network/protocol;1?name=http"].
                  getService(Ci.nsIHttpProtocolHandler).

toolkit/modules/moz.build

@@ -101,7 +101,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
 for var in ('ANDROID_PACKAGE_NAME',
             'MOZ_APP_NAME',
             'MOZ_APP_VERSION',
-            'MOZ_APP_VERSION_ABOUT',
+            'MOZ_APP_VERSION_DISPLAY',
             'MOZ_WIDGET_TOOLKIT',
             'DLL_PREFIX',
             'DLL_SUFFIX'):