Remove UpdateChannel.jsm
parent
6d4e3c5fd6
commit
482b97e4b7
|
@ -4,6 +4,8 @@
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
* 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/. */
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
#filter substitution
|
||||||
|
|
||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
const Cc = Components.classes;
|
const Cc = Components.classes;
|
||||||
|
@ -24,13 +26,8 @@ try {
|
||||||
|
|
||||||
XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
|
XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
|
||||||
"resource://gre/modules/FileUtils.jsm");
|
"resource://gre/modules/FileUtils.jsm");
|
||||||
#ifdef MOZ_WEBEXTENSIONS
|
|
||||||
XPCOMUtils.defineLazyModuleGetter(this, "UpdateUtils",
|
XPCOMUtils.defineLazyModuleGetter(this, "UpdateUtils",
|
||||||
"resource://gre/modules/UpdateUtils.jsm");
|
"resource://gre/modules/UpdateUtils.jsm");
|
||||||
#else
|
|
||||||
XPCOMUtils.defineLazyModuleGetter(this, "UpdateChannel",
|
|
||||||
"resource://gre/modules/UpdateChannel.jsm");
|
|
||||||
#endif
|
|
||||||
XPCOMUtils.defineLazyModuleGetter(this, "OS",
|
XPCOMUtils.defineLazyModuleGetter(this, "OS",
|
||||||
"resource://gre/modules/osfile.jsm");
|
"resource://gre/modules/osfile.jsm");
|
||||||
XPCOMUtils.defineLazyModuleGetter(this, "ServiceRequest",
|
XPCOMUtils.defineLazyModuleGetter(this, "ServiceRequest",
|
||||||
|
@ -531,21 +528,17 @@ Blocklist.prototype = {
|
||||||
|
|
||||||
dsURI = dsURI.replace(/%APP_ID%/g, gApp.ID);
|
dsURI = dsURI.replace(/%APP_ID%/g, gApp.ID);
|
||||||
// Not all applications implement nsIXULAppInfo (e.g. xpcshell doesn't).
|
// Not all applications implement nsIXULAppInfo (e.g. xpcshell doesn't).
|
||||||
if (gApp.version)
|
if (gApp.version){
|
||||||
dsURI = dsURI.replace(/%APP_VERSION%/g, gApp.version);
|
dsURI = dsURI.replace(/%APP_VERSION%/g, gApp.version);
|
||||||
dsURI = dsURI.replace(/%PRODUCT%/g, gApp.name);
|
|
||||||
// Not all applications implement nsIXULAppInfo (e.g. xpcshell doesn't).
|
|
||||||
if (gApp.version)
|
|
||||||
dsURI = dsURI.replace(/%VERSION%/g, gApp.version);
|
dsURI = dsURI.replace(/%VERSION%/g, gApp.version);
|
||||||
|
}
|
||||||
|
|
||||||
|
dsURI = dsURI.replace(/%PRODUCT%/g, gApp.name);
|
||||||
dsURI = dsURI.replace(/%BUILD_ID%/g, gApp.appBuildID);
|
dsURI = dsURI.replace(/%BUILD_ID%/g, gApp.appBuildID);
|
||||||
dsURI = dsURI.replace(/%BUILD_TARGET%/g, gApp.OS + "_" + gABI);
|
dsURI = dsURI.replace(/%BUILD_TARGET%/g, gApp.OS + "_" + gABI);
|
||||||
dsURI = dsURI.replace(/%OS_VERSION%/g, gOSVersion);
|
dsURI = dsURI.replace(/%OS_VERSION%/g, gOSVersion);
|
||||||
dsURI = dsURI.replace(/%LOCALE%/g, getLocale());
|
dsURI = dsURI.replace(/%LOCALE%/g, getLocale());
|
||||||
#ifdef MOZ_WEBEXTENSIONS
|
dsURI = dsURI.replace(/%CHANNEL%/g, "@MOZ_UPDATE_CHANNEL@");
|
||||||
dsURI = dsURI.replace(/%CHANNEL%/g, UpdateUtils.UpdateChannel);
|
|
||||||
#else
|
|
||||||
dsURI = dsURI.replace(/%CHANNEL%/g, UpdateChannel.get());
|
|
||||||
#endif
|
|
||||||
dsURI = dsURI.replace(/%PLATFORM_VERSION%/g, gApp.platformVersion);
|
dsURI = dsURI.replace(/%PLATFORM_VERSION%/g, gApp.platformVersion);
|
||||||
dsURI = dsURI.replace(/%DISTRIBUTION%/g,
|
dsURI = dsURI.replace(/%DISTRIBUTION%/g,
|
||||||
getDistributionPrefValue(PREF_APP_DISTRIBUTION));
|
getDistributionPrefValue(PREF_APP_DISTRIBUTION));
|
||||||
|
|
|
@ -1,47 +0,0 @@
|
||||||
#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;
|
|
||||||
}
|
|
||||||
};
|
|
|
@ -105,9 +105,6 @@ EXTRA_PP_JS_MODULES += [
|
||||||
'UpdateUtils.jsm',
|
'UpdateUtils.jsm',
|
||||||
]
|
]
|
||||||
|
|
||||||
if not CONFIG['MOZ_WEBEXTENSIONS']:
|
|
||||||
EXTRA_PP_JS_MODULES += ['UpdateChannel.jsm']
|
|
||||||
|
|
||||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'):
|
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'):
|
||||||
DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1
|
DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1
|
||||||
|
|
||||||
|
|
|
@ -38,8 +38,8 @@ XPCOMUtils.defineLazyGetter(this, "gCertUtils", function() {
|
||||||
return temp;
|
return temp;
|
||||||
});
|
});
|
||||||
|
|
||||||
XPCOMUtils.defineLazyModuleGetter(this, "UpdateChannel",
|
XPCOMUtils.defineLazyModuleGetter(this, "UpdateUtils",
|
||||||
"resource://gre/modules/UpdateChannel.jsm");
|
"resource://gre/modules/UpdateUtils.jsm");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Number of milliseconds after which we need to cancel `checkForAddons`.
|
* Number of milliseconds after which we need to cancel `checkForAddons`.
|
||||||
|
@ -190,33 +190,6 @@ XPCOMUtils.defineLazyGetter(this, "gOSVersion", function aus_gOSVersion() {
|
||||||
return osVersion;
|
return osVersion;
|
||||||
});
|
});
|
||||||
|
|
||||||
// This is copied directly from nsUpdateService.js
|
|
||||||
// It is used for calculating the URL string w/ var replacement.
|
|
||||||
// TODO: refactor this out somewhere else
|
|
||||||
XPCOMUtils.defineLazyGetter(this, "gABI", function aus_gABI() {
|
|
||||||
let abi = null;
|
|
||||||
try {
|
|
||||||
abi = Services.appinfo.XPCOMABI;
|
|
||||||
}
|
|
||||||
catch (e) {
|
|
||||||
LOG("gABI - XPCOM ABI unknown: updates are not possible.");
|
|
||||||
}
|
|
||||||
#ifdef XP_MACOSX
|
|
||||||
// Mac universal build should report a different ABI than either macppc
|
|
||||||
// or mactel.
|
|
||||||
let macutils = Cc["@mozilla.org/xpcom/mac-utils;1"].
|
|
||||||
getService(Ci.nsIMacUtils);
|
|
||||||
|
|
||||||
if (macutils.isUniversalBinary)
|
|
||||||
abi += "-u-" + macutils.architecturesInBinary;
|
|
||||||
#ifdef MOZ_SHARK
|
|
||||||
// Disambiguate optimised and shark nightlies
|
|
||||||
abi += "-shark"
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
return abi;
|
|
||||||
});
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provides an easy API for downloading and installing GMP Addons
|
* Provides an easy API for downloading and installing GMP Addons
|
||||||
*/
|
*/
|
||||||
|
@ -241,24 +214,7 @@ GMPInstallManager.prototype = {
|
||||||
log.info("Using url: " + url);
|
log.info("Using url: " + url);
|
||||||
}
|
}
|
||||||
|
|
||||||
url =
|
url = UpdateUtils.formatUpdateURL(url);
|
||||||
url.replace(/%PRODUCT%/g, Services.appinfo.name)
|
|
||||||
.replace(/%VERSION%/g, Services.appinfo.version)
|
|
||||||
.replace(/%BUILD_ID%/g, Services.appinfo.appBuildID)
|
|
||||||
.replace(/%BUILD_TARGET%/g, Services.appinfo.OS + "_" + gABI)
|
|
||||||
.replace(/%OS_VERSION%/g, gOSVersion);
|
|
||||||
if (/%LOCALE%/.test(url)) {
|
|
||||||
// TODO: Get the real local, does it actually matter for GMP plugins?
|
|
||||||
url = url.replace(/%LOCALE%/g, "en-US");
|
|
||||||
}
|
|
||||||
url =
|
|
||||||
url.replace(/%CHANNEL%/g, UpdateChannel.get())
|
|
||||||
.replace(/%PLATFORM_VERSION%/g, Services.appinfo.platformVersion)
|
|
||||||
.replace(/%DISTRIBUTION%/g,
|
|
||||||
GMPPrefs.get(GMPPrefs.KEY_APP_DISTRIBUTION))
|
|
||||||
.replace(/%DISTRIBUTION_VERSION%/g,
|
|
||||||
GMPPrefs.get(GMPPrefs.KEY_APP_DISTRIBUTION_VERSION))
|
|
||||||
.replace(/\+/g, "%2B");
|
|
||||||
log.info("Using url (with replacement): " + url);
|
log.info("Using url (with replacement): " + url);
|
||||||
return url;
|
return url;
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue