summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-02-19 15:05:50 -0500
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-14 12:46:46 +0200
commit3630fec5596f634e85749fa5abc4986843e6cbfa (patch)
tree99e35874818d8956248afb9c43607b5b19e0f061
parentd062e7311ca5673866e789e3757c21da6fe6c53e (diff)
downloadUXP-3630fec5596f634e85749fa5abc4986843e6cbfa.tar
UXP-3630fec5596f634e85749fa5abc4986843e6cbfa.tar.gz
UXP-3630fec5596f634e85749fa5abc4986843e6cbfa.tar.lz
UXP-3630fec5596f634e85749fa5abc4986843e6cbfa.tar.xz
UXP-3630fec5596f634e85749fa5abc4986843e6cbfa.zip
Issue #1454 - Add MOZ_PKG_SPECIAL to UpdateUtils
-rw-r--r--toolkit/modules/UpdateUtils.jsm4
-rw-r--r--toolkit/modules/moz.build1
2 files changed, 5 insertions, 0 deletions
diff --git a/toolkit/modules/UpdateUtils.jsm b/toolkit/modules/UpdateUtils.jsm
index 704fe116d..a84125be5 100644
--- a/toolkit/modules/UpdateUtils.jsm
+++ b/toolkit/modules/UpdateUtils.jsm
@@ -3,6 +3,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#filter substitution
+#if !MOZ_PKG_SPECIAL
+#define MOZ_PKG_SPECIAL false
+#endif
this.EXPORTED_SYMBOLS = ["UpdateUtils"];
@@ -70,6 +73,7 @@ this.UpdateUtils = {
url = url.replace(/%VERSION%/g, Services.appinfo.version);
url = url.replace(/%BUILD_ID%/g, Services.appinfo.appBuildID);
url = url.replace(/%BUILD_TARGET%/g, Services.appinfo.OS + "_" + this.ABI);
+ url = url.replace(/%BUILD_SPECIAL%/g, "@MOZ_PKG_SPECIAL@");
url = url.replace(/%OS_VERSION%/g, this.OSVersion);
url = url.replace(/%WIDGET_TOOLKIT%/g, "@MOZ_WIDGET_TOOLKIT@");
url = url.replace(/%CHANNEL%/g, this.UpdateChannel);
diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
index a6423913d..c9d3fc7a0 100644
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -139,6 +139,7 @@ for var in ('ANDROID_PACKAGE_NAME',
'MOZ_APP_VERSION_DISPLAY',
'MOZ_MACBUNDLE_NAME',
'MOZ_WIDGET_TOOLKIT',
+ 'MOZ_PKG_SPECIAL',
'DLL_PREFIX',
'DLL_SUFFIX',
'DEBUG_JS_MODULES'):