From 97ff781ee8ffc7f5298cb287d72d01d7e9cf9bbc Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sun, 11 Feb 2018 09:25:10 -0500 Subject: Add UpdateChannel.jsm --- toolkit/modules/UpdateChannel.jsm | 47 +++++++++++++++++++++++++++++++++++++++ toolkit/modules/moz.build | 3 +++ 2 files changed, 50 insertions(+) create mode 100644 toolkit/modules/UpdateChannel.jsm (limited to 'toolkit') diff --git a/toolkit/modules/UpdateChannel.jsm b/toolkit/modules/UpdateChannel.jsm new file mode 100644 index 000000000..c2bdce8ad --- /dev/null +++ b/toolkit/modules/UpdateChannel.jsm @@ -0,0 +1,47 @@ +#filter substitution + +/* 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/. */ + +this.EXPORTED_SYMBOLS = ["UpdateChannel"]; + +const Cu = Components.utils; + +Cu.import("resource://gre/modules/Services.jsm"); + +this.UpdateChannel = { + /** + * Read the update channel from defaults only. We do this to ensure that + * the channel is tightly coupled with the application and does not apply + * to other instances of the application that may use the same profile. + * + * @param [optional] aIncludePartners + * Whether or not to include the partner bits. Default: true. + */ + get: function UpdateChannel_get(aIncludePartners = true) { + let channel = "@MOZ_UPDATE_CHANNEL@"; + let defaults = Services.prefs.getDefaultBranch(null); + try { + channel = defaults.getCharPref("app.update.channel"); + } catch (e) { + // use default value when pref not found + } + + if (aIncludePartners) { + try { + let partners = Services.prefs.getChildList("app.partner.").sort(); + if (partners.length) { + channel += "-cck"; + partners.forEach(function (prefName) { + channel += "-" + Services.prefs.getCharPref(prefName); + }); + } + } catch (e) { + Cu.reportError(e); + } + } + + return channel; + } +}; diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build index 271c9b8f7..74c40a55e 100644 --- a/toolkit/modules/moz.build +++ b/toolkit/modules/moz.build @@ -104,6 +104,9 @@ EXTRA_JS_MODULES += [ EXTRA_JS_MODULES.third_party.jsesc += ['third_party/jsesc/jsesc.js'] EXTRA_JS_MODULES.sessionstore += ['sessionstore/Utils.jsm'] +if not CONFIG['MOZ_WEBEXTENSIONS']: + EXTRA_JS_PP_MODULES += ['UpdateChannel.jsm'] + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'): DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1 -- cgit v1.2.3 From d49ca9fc0fea5b4af766939d934428830cb4af86 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sun, 11 Feb 2018 09:31:31 -0500 Subject: Fix moz.build --- toolkit/modules/moz.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'toolkit') diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build index 74c40a55e..257741274 100644 --- a/toolkit/modules/moz.build +++ b/toolkit/modules/moz.build @@ -105,7 +105,7 @@ EXTRA_JS_MODULES.third_party.jsesc += ['third_party/jsesc/jsesc.js'] EXTRA_JS_MODULES.sessionstore += ['sessionstore/Utils.jsm'] if not CONFIG['MOZ_WEBEXTENSIONS']: - EXTRA_JS_PP_MODULES += ['UpdateChannel.jsm'] + EXTRA_PP_JS_MODULES += ['UpdateChannel.jsm'] if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'): DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1 -- cgit v1.2.3 From 3bcc6548c41f96878c8d0e0c8efe8632fcce16ba Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sun, 11 Feb 2018 10:47:51 -0500 Subject: Fix test paths for WebExAM --- .../mozapps/webextensions/test/browser/browser-window.ini | 14 +++++++------- toolkit/mozapps/webextensions/test/browser/browser.ini | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'toolkit') diff --git a/toolkit/mozapps/webextensions/test/browser/browser-window.ini b/toolkit/mozapps/webextensions/test/browser/browser-window.ini index fcda90fc6..ca9353d21 100644 --- a/toolkit/mozapps/webextensions/test/browser/browser-window.ini +++ b/toolkit/mozapps/webextensions/test/browser/browser-window.ini @@ -41,12 +41,12 @@ support-files = webapi_checkchromeframe.xul webapi_checkframed.html webapi_checknavigatedwindow.html - !/toolkit/mozapps/extensions/test/xpinstall/corrupt.xpi - !/toolkit/mozapps/extensions/test/xpinstall/incompatible.xpi - !/toolkit/mozapps/extensions/test/xpinstall/installtrigger.html - !/toolkit/mozapps/extensions/test/xpinstall/restartless.xpi - !/toolkit/mozapps/extensions/test/xpinstall/theme.xpi - !/toolkit/mozapps/extensions/test/xpinstall/unsigned.xpi - !/toolkit/mozapps/extensions/test/xpinstall/amosigned.xpi + !/toolkit/mozapps/webextensions/test/xpinstall/corrupt.xpi + !/toolkit/mozapps/webextensions/test/xpinstall/incompatible.xpi + !/toolkit/mozapps/webextensions/test/xpinstall/installtrigger.html + !/toolkit/mozapps/webextensions/test/xpinstall/restartless.xpi + !/toolkit/mozapps/webextensions/test/xpinstall/theme.xpi + !/toolkit/mozapps/webextensions/test/xpinstall/unsigned.xpi + !/toolkit/mozapps/webextensions/test/xpinstall/amosigned.xpi [include:browser-common.ini] diff --git a/toolkit/mozapps/webextensions/test/browser/browser.ini b/toolkit/mozapps/webextensions/test/browser/browser.ini index a23841d33..8a144baba 100644 --- a/toolkit/mozapps/webextensions/test/browser/browser.ini +++ b/toolkit/mozapps/webextensions/test/browser/browser.ini @@ -41,13 +41,13 @@ support-files = webapi_checkchromeframe.xul webapi_checkframed.html webapi_checknavigatedwindow.html - !/toolkit/mozapps/extensions/test/xpinstall/corrupt.xpi - !/toolkit/mozapps/extensions/test/xpinstall/incompatible.xpi - !/toolkit/mozapps/extensions/test/xpinstall/installtrigger.html - !/toolkit/mozapps/extensions/test/xpinstall/restartless.xpi - !/toolkit/mozapps/extensions/test/xpinstall/theme.xpi - !/toolkit/mozapps/extensions/test/xpinstall/unsigned.xpi - !/toolkit/mozapps/extensions/test/xpinstall/amosigned.xpi + !/toolkit/mozapps/webextensions/test/xpinstall/corrupt.xpi + !/toolkit/mozapps/webextensions/test/xpinstall/incompatible.xpi + !/toolkit/mozapps/webextensions/test/xpinstall/installtrigger.html + !/toolkit/mozapps/webextensions/test/xpinstall/restartless.xpi + !/toolkit/mozapps/webextensions/test/xpinstall/theme.xpi + !/toolkit/mozapps/webextensions/test/xpinstall/unsigned.xpi + !/toolkit/mozapps/webextensions/test/xpinstall/amosigned.xpi [browser_addonrepository_performance.js] [browser_bug557956.js] -- cgit v1.2.3