From f2649915eb617ed43bd1beabee5df69632c3a78f Mon Sep 17 00:00:00 2001
From: Mike Kaply <mozilla@kaply.com>
Date: Thu, 22 Jul 2021 20:00:26 +0000
Subject: [PATCH] Bug 1720389 - Add IS_ESR to AppConstants and rename ESR
 #ifdef to MOZ_ESR. r=glandium

Differential Revision: https://phabricator.services.mozilla.com/D120371
---
 browser/base/content/aboutDialog.js | 2 +-
 build/moz.configure/init.configure  | 6 +++---
 toolkit/modules/AppConstants.jsm    | 7 +++++++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/browser/base/content/aboutDialog.js b/browser/base/content/aboutDialog.js
index 197525a85a13..031bad6796e9 100644
--- a/browser/base/content/aboutDialog.js
+++ b/browser/base/content/aboutDialog.js
@@ -108,7 +108,7 @@ async function init(aEvent) {
     }
   }
 
-  if (AppConstants.MOZ_APP_VERSION_DISPLAY.endsWith("esr")) {
+  if (AppConstants.IS_ESR) {
     document.getElementById("release").hidden = false;
   }
 
diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
index 1e926b4e8862..3a164c655871 100644
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -1259,7 +1259,7 @@ def milestone(build_env, build_project, version_path, _):
         is_nightly=is_nightly,
         is_release_or_beta=is_release_or_beta,
         is_early_beta_or_earlier=is_early_beta_or_earlier,
-        is_esr=app_version_display.endswith("esr"),
+        is_esr=app_version_display.endswith("esr") or None,
         app_version=app_version,
         app_version_display=app_version_display,
     )
@@ -1271,8 +1271,8 @@ set_define("NIGHTLY_BUILD", milestone.is_nightly)
 set_config("RELEASE_OR_BETA", milestone.is_release_or_beta)
 set_define("RELEASE_OR_BETA", milestone.is_release_or_beta)
 add_old_configure_assignment("RELEASE_OR_BETA", milestone.is_release_or_beta)
-set_config("ESR", milestone.is_esr)
-set_define("ESR", milestone.is_esr)
+set_config("MOZ_ESR", milestone.is_esr)
+set_define("MOZ_ESR", milestone.is_esr)
 set_config("EARLY_BETA_OR_EARLIER", milestone.is_early_beta_or_earlier)
 set_define("EARLY_BETA_OR_EARLIER", milestone.is_early_beta_or_earlier)
 add_old_configure_assignment(
diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm
index bb1ce3062eef..9b3acf6ecc30 100644
--- a/toolkit/modules/AppConstants.jsm
+++ b/toolkit/modules/AppConstants.jsm
@@ -37,6 +37,13 @@ this.AppConstants = Object.freeze({
   false,
 #endif
 
+  IS_ESR:
+#ifdef MOZ_ESR
+  true,
+#else
+  false,
+#endif
+
   ACCESSIBILITY:
 #ifdef ACCESSIBILITY
   true,