Bug 1582976 - Use version_display.txt in SeaMonkey about page. r=IanN a=IanN
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Tue, 01 Oct 2019 16:59:19 +0200
changeset 32318 1562bf096151922a86b717c6883c3ab7fa2efee6
parent 32317 fe41cc38a07256e7992bbf89d5e84b49589b0a84
child 32319 2de29b2f2c3ed933481691812f51df071a78d512
push id220
push userfrgrahl@gmx.net
push dateTue, 01 Oct 2019 15:01:16 +0000
treeherdercomm-esr60@e71c6693877f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersIanN, IanN
bugs1582976
Bug 1582976 - Use version_display.txt in SeaMonkey about page. r=IanN a=IanN
suite/base/content/about.js
suite/config/version_display.txt
suite/confvars.sh
--- a/suite/base/content/about.js
+++ b/suite/base/content/about.js
@@ -1,30 +1,31 @@
 /* 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/. */
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
+ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
 
 window.onload = function () {
   // get release notes URL and vendor URL from prefs
   var releaseNotesURL = Services.urlFormatter.formatURLPref("app.releaseNotesURL");
   if (releaseNotesURL != "about:blank") {
     var relnotes = document.getElementById("releaseNotesURL");
     relnotes.href = releaseNotesURL;
   }
 
   var vendorURL = Services.urlFormatter.formatURLPref("app.vendorURL");
   if (vendorURL != "about:blank") {
     var vendor = document.getElementById("vendorURL");
     vendor.href = vendorURL;
   }
 
   // append the version of the XUL application (!= XULRunner platform version)
-  var versionNum = Services.appinfo.version;
+  var versionNum = AppConstants.MOZ_APP_VERSION_DISPLAY;
   var version = document.getElementById("version");
   version.appendChild(document.createTextNode(versionNum));
 
   // append user agent
   var ua = navigator.userAgent;
   if (ua) {
     var uaItem = document.getElementById("userAgent");
     uaItem.appendChild(document.createTextNode(ua));
copy from suite/config/version.txt
copy to suite/config/version_display.txt
--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -16,16 +16,18 @@ MOZ_UPDATER=1
 # If more than one ID is needed, then you should use a comma separated list
 # of values.
 ACCEPTED_MAR_CHANNEL_IDS=seamonkey-comm-central
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
 MAR_CHANNEL_ID=seamonkey-comm-central
 
 MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
 MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
+MOZ_APP_VERSION_DISPLAY_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version_display.txt
+MOZ_APP_VERSION_DISPLAY=`cat $MOZ_APP_VERSION_DISPLAY_TXT`
 SEAMONKEY_VERSION=$MOZ_APP_VERSION
 
 MOZ_APP_ID={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 MOZ_PROFILE_MIGRATOR=1
 
 if test "$OS_ARCH" = "WINNT" -o \
         "$OS_ARCH" = "Linux"; then
   MOZ_BUNDLED_FONTS=1