From b2c697e385b70afafd47057c22fce270fc19a19b 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 diff --git a/toolkit/modules/UpdateChannel.jsm b/toolkit/modules/UpdateChannel.jsm new file mode 100644 index 0000000000..c2bdce8ad5 --- /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 271c9b8f74..74c40a55e4 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 f161c76dade33301b4c76d63abfaa15f989e6283 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(-) diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build index 74c40a55e4..2577412747 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 b6390b1fde33ac528ef166d5bcd19612fca9316e Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sun, 11 Feb 2018 09:41:53 -0500 Subject: Fix Basilisk packaging when not using WebExtensions enabled Add-on Manager --- browser/installer/allowed-dupes.mn | 8 ++++++++ browser/installer/package-manifest.in | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupes.mn index 2ea55aff4b..3668425984 100644 --- a/browser/installer/allowed-dupes.mn +++ b/browser/installer/allowed-dupes.mn @@ -202,9 +202,17 @@ chrome/toolkit/skin/classic/mozapps/extensions/category-dictionaries.png chrome/toolkit/skin/classic/mozapps/extensions/category-experiments.png chrome/toolkit/skin/classic/mozapps/extensions/dictionaryGeneric.png chrome/toolkit/skin/classic/mozapps/extensions/experimentGeneric.png +chrome/toolkit/skin/classic/mozapps/extensions/category-themes.png +chrome/toolkit/skin/classic/mozapps/extensions/themeGeneric.png +chrome/toolkit/skin/classic/mozapps/extensions/category-languages.png +chrome/toolkit/skin/classic/mozapps/extensions/localeGeneric.png +chrome/toolkit/skin/classic/mozapps/extensions/category-extensions.png +chrome/toolkit/skin/classic/mozapps/extensions/extensionGeneric.png chrome/toolkit/skin/classic/mozapps/update/buttons.png chrome/toolkit/skin/classic/mozapps/update/downloadButtons-XP.png chrome/toolkit/skin/classic/mozapps/update/downloadButtons.png +chrome/toolkit/skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png + components/FxAccountsPush.js crashreporter.app/Contents/Resources/English.lproj/MainMenu.nib/classes.nib crashreporter.app/Contents/Resources/English.lproj/MainMenuRTL.nib/classes.nib diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index ba7904719a..bddca2f294 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -417,10 +417,14 @@ @RESPATH@/components/addonManager.js @RESPATH@/components/amContentHandler.js @RESPATH@/components/amInstallTrigger.js +#ifdef MOZ_WEBEXTENSIONS @RESPATH@/components/amWebAPI.js +#endif @RESPATH@/components/amWebInstallListener.js @RESPATH@/components/nsBlocklistService.js +#ifdef MOZ_WEBEXTENSIONS @RESPATH@/components/nsBlocklistServiceContent.js +#endif #ifdef MOZ_UPDATER @RESPATH@/components/nsUpdateService.manifest @RESPATH@/components/nsUpdateService.js @@ -569,9 +573,11 @@ @RESPATH@/components/TestInterfaceJSMaplike.js #endif +#ifdef MOZ_WEBEXTENSIONS ; [Extensions] @RESPATH@/components/extensions-toolkit.manifest @RESPATH@/browser/components/extensions-browser.manifest +#endif ; Modules @RESPATH@/browser/modules/* -- cgit v1.2.3 From abfae6e00b87c039e1f9613afd780af6e97ede6f 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 --- dom/plugins/test/unit/xpcshell.ini | 2 +- .../mozapps/webextensions/test/browser/browser-window.ini | 14 +++++++------- toolkit/mozapps/webextensions/test/browser/browser.ini | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dom/plugins/test/unit/xpcshell.ini b/dom/plugins/test/unit/xpcshell.ini index 8dae66b208..69b6731b20 100644 --- a/dom/plugins/test/unit/xpcshell.ini +++ b/dom/plugins/test/unit/xpcshell.ini @@ -5,7 +5,7 @@ tail = tags = addons firefox-appdir = browser support-files = - !/toolkit/mozapps/extensions/test/xpcshell/head_addons.js + !/toolkit/mozapps/webextensions/test/xpcshell/head_addons.js [test_allowed_types.js] skip-if = appname == "thunderbird" diff --git a/toolkit/mozapps/webextensions/test/browser/browser-window.ini b/toolkit/mozapps/webextensions/test/browser/browser-window.ini index fcda90fc68..ca9353d213 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 a23841d332..8a144babad 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