Revert "No Issue - Hardcode XAI.platformVersion to 52.9.0 and add XAI.greVersion as the actual version"

This reverts commit 0c2396808491278981bec84e8998b29ec19d297d.

10 files changed, 17 insertions, 41 deletions

diff --git a/components/addons/src/AddonManager.jsm b/components/addons/src/AddonManager.jsm
index b1cc0978e..44aa11d65 100644
--- a/components/addons/src/AddonManager.jsm
+++ b/components/addons/src/AddonManager.jsm
@@ -779,7 +779,7 @@ var AddonManagerInternal = {
         Services.prefs.setCharPref(PREF_EM_LAST_APP_VERSION,
                                    Services.appinfo.version);
         Services.prefs.setCharPref(PREF_EM_LAST_PLATFORM_VERSION,
-                                   Services.appinfo.greVersion);
+                                   Services.appinfo.platformVersion);
         Services.prefs.setIntPref(PREF_BLOCKLIST_PINGCOUNTVERSION,
                                   (appChanged === undefined ? 0 : -1));
         this.validateBlocklist();
diff --git a/components/addons/src/AddonRepository.jsm b/components/addons/src/AddonRepository.jsm
index 8432886b6..41fb5c06d 100644
--- a/components/addons/src/AddonRepository.jsm
+++ b/components/addons/src/AddonRepository.jsm
@@ -1545,7 +1545,7 @@ this.AddonRepository = {
 
       let appVersion = null;
       if (override.appID == TOOLKIT_ID)
-        appVersion = aPlatformVersion || Services.appinfo.greVersion;
+        appVersion = aPlatformVersion || Services.appinfo.platformVersion;
       else
         appVersion = aAppVersion || Services.appinfo.version;
 
diff --git a/components/addons/src/AddonUpdateChecker.jsm b/components/addons/src/AddonUpdateChecker.jsm
index 17c17c907..bfff493bf 100644
--- a/components/addons/src/AddonUpdateChecker.jsm
+++ b/components/addons/src/AddonUpdateChecker.jsm
@@ -494,7 +494,7 @@ function parseJSONManifest(aId, aUpdateKey, aRequest, aManifestData) {
   }
 
   let appID = Services.appinfo.ID;
-  let platformVersion = Services.appinfo.greVersion;
+  let platformVersion = Services.appinfo.platformVersion;
 
   // The list of available updates
   let updates = getProperty(addon, "updates", "array", []);
@@ -854,7 +854,7 @@ this.AddonUpdateChecker = {
     if (!aAppVersion)
       aAppVersion = Services.appinfo.version;
     if (!aPlatformVersion)
-      aPlatformVersion = Services.appinfo.greVersion;
+      aPlatformVersion = Services.appinfo.platformVersion;
 
     for (let update of aUpdates) {
       if (Services.vc.compare(update.version, aVersion) == 0) {
@@ -897,7 +897,7 @@ this.AddonUpdateChecker = {
     if (!aAppVersion)
       aAppVersion = Services.appinfo.version;
     if (!aPlatformVersion)
-      aPlatformVersion = Services.appinfo.greVersion;
+      aPlatformVersion = Services.appinfo.platformVersion;
 
     let blocklist = Cc["@mozilla.org/extensions/blocklist;1"].
                     getService(Ci.nsIBlocklistService);
diff --git a/components/addons/src/XPIProvider.jsm b/components/addons/src/XPIProvider.jsm
index e9e556f99..0a81e01db 100644
--- a/components/addons/src/XPIProvider.jsm
+++ b/components/addons/src/XPIProvider.jsm
@@ -6180,7 +6180,7 @@ UpdateChecker.prototype = {
     if ((this.appVersion &&
          Services.vc.compare(this.appVersion, Services.appinfo.version) != 0) ||
         (this.platformVersion &&
-         Services.vc.compare(this.platformVersion, Services.appinfo.greVersion) != 0)) {
+         Services.vc.compare(this.platformVersion, Services.appinfo.platformVersion) != 0)) {
       compatUpdate = AUC.getCompatibilityUpdate(aUpdates, this.addon.version,
                                                 false, this.appVersion,
                                                 this.platformVersion,
@@ -6362,7 +6362,7 @@ AddonInternal.prototype = {
     if (!aAppVersion)
       aAppVersion = Services.appinfo.version;
     if (!aPlatformVersion)
-      aPlatformVersion = Services.appinfo.greVersion;
+      aPlatformVersion = Services.appinfo.platformVersion;
 
     let version;
     if (app.id == Services.appinfo.ID) {
diff --git a/components/blocklist/nsBlocklistService.js b/components/blocklist/nsBlocklistService.js
index 50de11038..188fdfb38 100644
--- a/components/blocklist/nsBlocklistService.js
+++ b/components/blocklist/nsBlocklistService.js
@@ -387,7 +387,7 @@ Blocklist.prototype = {
     if (!appVersion)
       appVersion = gApp.version;
     if (!toolkitVersion)
-      toolkitVersion = gApp.greVersion;
+      toolkitVersion = gApp.platformVersion;
 
     var blItem = this._findMatchingAddonEntry(addonEntries, addon);
     if (!blItem)
@@ -529,7 +529,7 @@ Blocklist.prototype = {
     dsURI = dsURI.replace(/%OS_VERSION%/g, gOSVersion);
     dsURI = dsURI.replace(/%LOCALE%/g, getLocale());
     dsURI = dsURI.replace(/%CHANNEL%/g, "@MOZ_UPDATE_CHANNEL@");
-    dsURI = dsURI.replace(/%PLATFORM_VERSION%/g, gApp.greVersion);
+    dsURI = dsURI.replace(/%PLATFORM_VERSION%/g, gApp.platformVersion);
     dsURI = dsURI.replace(/%DISTRIBUTION%/g,
                       getDistributionPrefValue(PREF_APP_DISTRIBUTION));
     dsURI = dsURI.replace(/%DISTRIBUTION_VERSION%/g,
@@ -1137,7 +1137,7 @@ Blocklist.prototype = {
     if (!appVersion)
       appVersion = gApp.version;
     if (!toolkitVersion)
-      toolkitVersion = gApp.greVersion;
+      toolkitVersion = gApp.platformVersion;
 
     for (var blockEntry of pluginEntries) {
       var matchFailed = false;
diff --git a/components/urlformatter/nsURLFormatter.js b/components/urlformatter/nsURLFormatter.js
index 86ebf5961..8bb68bc45 100644
--- a/components/urlformatter/nsURLFormatter.js
+++ b/components/urlformatter/nsURLFormatter.js
@@ -97,7 +97,7 @@ nsURLFormatterService.prototype = {
     VERSION:          function() { return this.appInfo.version; },
     MAJOR_VERSION:    function() { return this.appInfo.version.replace(/^([^\.]+\.[0-9]+[a-z]*).*/gi, "$1"); },
     APPBUILDID:       function() { return this.appInfo.appBuildID; },
-    PLATFORMVERSION:  function() { return this.appInfo.greVersion; },
+    PLATFORMVERSION:  function() { return this.appInfo.platformVersion; },
     PLATFORMBUILDID:  function() { return this.appInfo.platformBuildID; },
     APP:              function() { return this.appInfo.name.toLowerCase().replace(/ /, ""); },
     OS:               function() { return this.appInfo.OS; },
diff --git a/modules/UpdateUtils.jsm b/modules/UpdateUtils.jsm
index 79de8f75f..5e3a2e100 100644
--- a/modules/UpdateUtils.jsm
+++ b/modules/UpdateUtils.jsm
@@ -78,7 +78,7 @@ this.UpdateUtils = {
       [/%WIDGET_TOOLKIT%/g,         "@MOZ_WIDGET_TOOLKIT@"],
       [/%CHANNEL%/g,                this.UpdateChannel],
       [/%CUSTOM%/g,                 custom],
-      [/%PLATFORM_VERSION%/g,       Services.appinfo.greVersion],
+      [/%PLATFORM_VERSION%/g,       Services.appinfo.platformVersion],
       [/%DISTRIBUTION%/g,           distribution],
       [/%DISTRIBUTION_VERSION%/g,   distributionVersion],
       [/%LOCALE%/g,                 this.Locale]     
diff --git a/system/runtime/nsAppRunner.cpp b/system/runtime/nsAppRunner.cpp
index fe2c59479..32834580b 100644
--- a/system/runtime/nsAppRunner.cpp
+++ b/system/runtime/nsAppRunner.cpp
@@ -175,8 +175,7 @@ extern void InstallSignalHandlers(const char *ProgramName);
 int    gArgc;
 char **gArgv;
 
-static const char gGoannaVersion[] = NS_STRINGIFY(GRE_MILESTONE);
-static const char gToolkitVersion[] = "52.9.0";
+static const char gToolkitVersion[] = NS_STRINGIFY(GRE_MILESTONE);
 static const char gToolkitBuildID[] = NS_STRINGIFY(MOZ_BUILDID);
 
 static nsIProfileLock* gProfileLock;
@@ -685,14 +684,6 @@ nsXULAppInfo::GetVersion(nsACString& aResult)
 }
 
 NS_IMETHODIMP
-nsXULAppInfo::GetGreVersion(nsACString& aResult)
-{
-  aResult.Assign(gGoannaVersion);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
 nsXULAppInfo::GetPlatformVersion(nsACString& aResult)
 {
   aResult.Assign(gToolkitVersion);
@@ -2808,11 +2799,11 @@ XREMain::XRE_mainInit(bool* aExitFlag)
       SetAllocatedString(mAppData->maxVersion, "1.*");
     }
 
-    if (mozilla::Version(mAppData->minVersion) > gGoannaVersion ||
-        mozilla::Version(mAppData->maxVersion) < gGoannaVersion) {
+    if (mozilla::Version(mAppData->minVersion) > gToolkitVersion ||
+        mozilla::Version(mAppData->maxVersion) < gToolkitVersion) {
       Output(true, "Error: Platform version '%s' is not compatible with\n"
              "minVersion >= %s\nmaxVersion <= %s\n",
-             gGoannaVersion,
+             gToolkitVersion,
              mAppData->minVersion, mAppData->maxVersion);
       return 1;
     }
diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp
index 45c47f1f8..8d94a1545 100644
--- a/xpcom/components/ManifestParser.cpp
+++ b/xpcom/components/ManifestParser.cpp
@@ -465,7 +465,6 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf,
   NS_NAMED_LITERAL_STRING(kRemoteRequired, "remoterequired");
   NS_NAMED_LITERAL_STRING(kApplication, "application");
   NS_NAMED_LITERAL_STRING(kAppVersion, "appversion");
-  NS_NAMED_LITERAL_STRING(kGoannaVersion, "greversion");
   NS_NAMED_LITERAL_STRING(kGeckoVersion, "platformversion");
   NS_NAMED_LITERAL_STRING(kOs, "os");
   NS_NAMED_LITERAL_STRING(kOsVersion, "osversion");
@@ -480,7 +479,6 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf,
 
   nsAutoString appID;
   nsAutoString appVersion;
-  nsAutoString goannaVersion;
   nsAutoString geckoVersion;
   nsAutoString osTarget;
   nsAutoString abi;
@@ -504,11 +502,6 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf,
       CopyUTF8toUTF16(s, appVersion);
     }
 
-    rv = xapp->GetGreVersion(s);
-    if (NS_SUCCEEDED(rv)) {
-      CopyUTF8toUTF16(s, goannaVersion);
-    }
-
     rv = xapp->GetPlatformVersion(s);
     if (NS_SUCCEEDED(rv)) {
       CopyUTF8toUTF16(s, geckoVersion);
@@ -641,7 +634,6 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf,
 
     bool ok = true;
     TriState stAppVersion = eUnspecified;
-    TriState stGoannaVersion = eUnspecified;
     TriState stGeckoVersion = eUnspecified;
     TriState stApp = eUnspecified;
     TriState stOsVersion = eUnspecified;
@@ -662,7 +654,6 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf,
           CheckStringFlag(kProcess, wtoken, process, stProcess) ||
           CheckVersionFlag(kOsVersion, wtoken, osVersion, stOsVersion) ||
           CheckVersionFlag(kAppVersion, wtoken, appVersion, stAppVersion) ||
-          CheckVersionFlag(kGoannaVersion, wtoken, goannaVersion, stGoannaVersion) ||
           CheckVersionFlag(kGeckoVersion, wtoken, geckoVersion, stGeckoVersion)) {
         continue;
       }
@@ -708,7 +699,6 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf,
     if (!ok ||
         stApp == eBad ||
         stAppVersion == eBad ||
-        stGoannaVersion == eBad ||
         stGeckoVersion == eBad ||
         stOs == eBad ||
         stOsVersion == eBad ||
diff --git a/xpcom/system/nsIPlatformInfo.idl b/xpcom/system/nsIPlatformInfo.idl
index 24d5d5dc9..fba78b6ec 100644
--- a/xpcom/system/nsIPlatformInfo.idl
+++ b/xpcom/system/nsIPlatformInfo.idl
@@ -4,15 +4,10 @@
 
 #include "nsISupports.idl"
 
-[scriptable, uuid(2d4202b9-4d2f-46f1-bb6a-e9a117dff66c)]
+[scriptable, uuid(ab6650cf-0806-4aea-b8f2-40fdae74f1cc)]
 interface nsIPlatformInfo : nsISupports
 {
   /**
-   * The /true/ version of the Goanna Runtime Environment.
-   */
-  readonly attribute ACString greVersion;
-
-  /**
    * The version of the XULRunner platform.
    */
   readonly attribute ACString platformVersion;