diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-02-19 15:05:50 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2020-02-19 15:05:50 -0500 |
| commit | e6b48cb648c7ec7f355fbdd7fd638e472a2aee93 (patch) | |
| tree | 74bfabf1d039b7b9d57bdf4ebf94d0fc5b266296 /toolkit | |
| parent | 8dc04fc24bac6ed233fd566d268bd57943de51f1 (diff) | |
| download | UXP-e6b48cb648c7ec7f355fbdd7fd638e472a2aee93.tar UXP-e6b48cb648c7ec7f355fbdd7fd638e472a2aee93.tar.gz UXP-e6b48cb648c7ec7f355fbdd7fd638e472a2aee93.tar.lz UXP-e6b48cb648c7ec7f355fbdd7fd638e472a2aee93.tar.xz UXP-e6b48cb648c7ec7f355fbdd7fd638e472a2aee93.zip | |
Issue #1454 - Add MOZ_PKG_SPECIAL to UpdateUtils
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/modules/UpdateUtils.jsm | 4 | ||||
| -rw-r--r-- | toolkit/modules/moz.build | 1 |
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'): |