Bug 1145171 - Show the detailed version in about:support (usefull for beta, no impact for the rest) r=dolske
authorSylvestre Ledru <sledru@mozilla.com>
Sat, 11 Jul 2015 19:36:42 -0600
changeset 252659 f629ea0eb5b1ed42961835c75bbed3e00964bbe9
parent 252658 0bcc47d215e7f25ae24b11846b50f595cc46c42c
child 252660 e740662a03631d580d1f17961e0878df25b330ba
push id62206
push usersledru@mozilla.com
push dateTue, 14 Jul 2015 00:17:12 +0000
treeherdermozilla-inbound@e740662a0363 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdolske
bugs1145171
milestone42.0a1
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
Bug 1145171 - Show the detailed version in about:support (usefull for beta, no impact for the rest) r=dolske
toolkit/content/aboutSupport.js
toolkit/modules/AppConstants.jsm
toolkit/modules/Troubleshoot.jsm
toolkit/modules/moz.build
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
@@ -5,16 +5,17 @@
 "use strict";
 
 const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Troubleshoot.jsm");
 Cu.import("resource://gre/modules/ResetProfile.jsm");
+Cu.import("resource://gre/modules/AppConstants.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "PluralForm",
                                   "resource://gre/modules/PluralForm.jsm");
 
 window.addEventListener("load", function onload(event) {
   try {
   window.removeEventListener("load", onload, false);
   Troubleshoot.snapshot(function (snapshot) {
@@ -32,17 +33,17 @@ window.addEventListener("load", function
 // snapshot data.  Each function is passed its property's corresponding data,
 // and it's the function's job to update the page with it.
 let snapshotFormatters = {
 
   application: function application(data) {
     $("application-box").textContent = data.name;
     $("useragent-box").textContent = data.userAgent;
     $("supportLink").href = data.supportURL;
-    let version = data.version;
+    let version = AppConstants.MOZ_APP_VERSION_ABOUT;
     if (data.vendor)
       version += " (" + data.vendor + ")";
     $("version-box").textContent = version;
     $("buildid-box").textContent = data.buildID;
     if (data.updateChannel)
       $("updatechannel-box").textContent = data.updateChannel;
 
     $("multiprocess-box").textContent = stringBundle().formatStringFromName("multiProcessStatus",
--- a/toolkit/modules/AppConstants.jsm
+++ b/toolkit/modules/AppConstants.jsm
@@ -167,13 +167,14 @@ this.AppConstants = Object.freeze({
   false,
 #endif
 
   DLL_PREFIX: "@DLL_PREFIX@",
   DLL_SUFFIX: "@DLL_SUFFIX@",
 
   MOZ_APP_NAME: "@MOZ_APP_NAME@",
   MOZ_APP_VERSION: "@MOZ_APP_VERSION@",
+  MOZ_APP_VERSION_ABOUT: "@MOZ_APP_VERSION_ABOUT@",
   MOZ_BUILD_APP: "@MOZ_BUILD_APP@",
   MOZ_UPDATE_CHANNEL: "@MOZ_UPDATE_CHANNEL@",
   MOZ_WIDGET_TOOLKIT: "@MOZ_WIDGET_TOOLKIT@",
   ANDROID_PACKAGE_NAME: "@ANDROID_PACKAGE_NAME@",
 });
--- a/toolkit/modules/Troubleshoot.jsm
+++ b/toolkit/modules/Troubleshoot.jsm
@@ -167,17 +167,17 @@ this.Troubleshoot = {
 // generate the provider's data.  The function is passed a "done" callback, and
 // when done, it must pass its data to the callback.  The resulting snapshot
 // object will contain a name => data entry for each provider.
 let dataProviders = {
 
   application: function application(done) {
     let data = {
       name: Services.appinfo.name,
-      version: Services.appinfo.version,
+      version: AppConstants.MOZ_APP_VERSION_ABOUT,
       buildID: Services.appinfo.appBuildID,
       userAgent: Cc["@mozilla.org/network/protocol;1?name=http"].
                  getService(Ci.nsIHttpProtocolHandler).
                  userAgent,
       safeMode: Services.appinfo.inSafeMode,
     };
 
     if (AppConstants.MOZ_UPDATER)
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -96,16 +96,17 @@ else:
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     EXTRA_JS_MODULES += [
         'WindowsRegistry.jsm',
     ]
 
 for var in ('ANDROID_PACKAGE_NAME',
             'MOZ_APP_NAME',
             'MOZ_APP_VERSION',
+            'MOZ_APP_VERSION_ABOUT',
             'MOZ_WIDGET_TOOLKIT',
             'DLL_PREFIX',
             'DLL_SUFFIX'):
             DEFINES[var] = CONFIG[var]
 
 for var in ('MOZILLA_OFFICIAL',
             'MOZ_TOOLKIT_SEARCH',
             'MOZ_UPDATER'):