зеркало из https://github.com/mozilla/gecko-dev.git
Merge mozilla-central to autoland a=merge on a CLOSED TREE
This commit is contained in:
Coroiu Cristina
Коммит
77ce7192a9
|
|
@ -0,0 +1,9 @@
|
|||
function f(x) {
|
||||
this["__proto__"] = x;
|
||||
let tmp = this.toString;
|
||||
assertEq(x === null, tmp === void 0);
|
||||
}
|
||||
|
||||
for (let e of [[], null, []]) {
|
||||
new f(e);
|
||||
}
|
||||
|
|
@ -772,12 +772,17 @@ ShapeGuardProtoChain(CacheIRWriter& writer, JSObject* obj, ObjOperandId objId)
|
|||
bool guardProto = obj->hasUncacheableProto();
|
||||
|
||||
obj = obj->staticPrototype();
|
||||
if (!obj)
|
||||
if (!obj && !guardProto)
|
||||
return;
|
||||
|
||||
objId = writer.loadProto(objId);
|
||||
|
||||
if (guardProto)
|
||||
writer.guardSpecificObject(objId, obj);
|
||||
|
||||
if (!obj)
|
||||
return;
|
||||
|
||||
writer.guardShape(objId, obj->as<NativeObject>().shape());
|
||||
}
|
||||
}
|
||||
|
|
@ -1114,7 +1119,7 @@ GetPropIRGenerator::tryAttachCrossCompartmentWrapper(HandleObject obj, ObjOperan
|
|||
RootedShape shape(cx_);
|
||||
RootedNativeObject holder(cx_);
|
||||
|
||||
// Enter compartment of target since some checks have side-effects
|
||||
// Enter realm of target since some checks have side-effects
|
||||
// such as de-lazifying type info.
|
||||
{
|
||||
AutoRealm ar(cx_, unwrapped);
|
||||
|
|
|
|||
|
|
@ -686,7 +686,7 @@ class MOZ_RAII CacheIRWriter : public JS::CustomAutoRooter
|
|||
void guardCompartment(ObjOperandId obj, JSObject* global, JSCompartment* compartment) {
|
||||
assertSameCompartment(global);
|
||||
writeOpWithOperandId(CacheOp::GuardCompartment, obj);
|
||||
// Add a reference to the compartment's global to keep it alive.
|
||||
// Add a reference to a global in the compartment to keep it alive.
|
||||
addStubField(uintptr_t(global), StubField::Type::JSObject);
|
||||
// Use RawWord, because compartments never move and it can't be GCed.
|
||||
addStubField(uintptr_t(compartment), StubField::Type::RawWord);
|
||||
|
|
|
|||
|
|
@ -3277,6 +3277,7 @@ MacroAssembler::branchTestObjCompartment(Condition cond, Register obj, const Add
|
|||
MOZ_ASSERT(obj != scratch);
|
||||
loadPtr(Address(obj, JSObject::offsetOfGroup()), scratch);
|
||||
loadPtr(Address(scratch, ObjectGroup::offsetOfRealm()), scratch);
|
||||
loadPtr(Address(scratch, Realm::offsetOfCompartment()), scratch);
|
||||
branchPtr(cond, compartment, scratch, label);
|
||||
}
|
||||
|
||||
|
|
@ -3288,6 +3289,7 @@ MacroAssembler::branchTestObjCompartment(Condition cond, Register obj,
|
|||
MOZ_ASSERT(obj != scratch);
|
||||
loadPtr(Address(obj, JSObject::offsetOfGroup()), scratch);
|
||||
loadPtr(Address(scratch, ObjectGroup::offsetOfRealm()), scratch);
|
||||
loadPtr(Address(scratch, Realm::offsetOfCompartment()), scratch);
|
||||
branchPtr(cond, scratch, ImmPtr(compartment), label);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1289,6 +1289,9 @@ class JS::Realm : public JS::shadow::Realm
|
|||
|
||||
void sweepSavedStacks();
|
||||
|
||||
static constexpr size_t offsetOfCompartment() {
|
||||
return offsetof(JS::Realm, compartment_);
|
||||
}
|
||||
static constexpr size_t offsetOfRegExps() {
|
||||
return offsetof(JS::Realm, regExps);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ package org.mozilla.geckoview.test
|
|||
|
||||
import org.mozilla.geckoview.GeckoResponse
|
||||
import org.mozilla.geckoview.GeckoSession
|
||||
import org.mozilla.geckoview.GeckoSessionSettings
|
||||
import org.mozilla.geckoview.GeckoSession.TrackingProtectionDelegate;
|
||||
import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.AssertCalled
|
||||
import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.NullDelegate
|
||||
|
|
@ -45,6 +46,40 @@ class NavigationDelegateTest : BaseSessionTest() {
|
|||
})
|
||||
}
|
||||
|
||||
@WithDevToolsAPI
|
||||
@Test fun desktopMode() {
|
||||
sessionRule.session.loadUri("https://example.com")
|
||||
sessionRule.waitForPageStop()
|
||||
|
||||
val userAgentJs = "window.navigator.userAgent"
|
||||
val mobileSubStr = "Mobile"
|
||||
val desktopSubStr = "X11"
|
||||
|
||||
assertThat("User agent should be set to mobile",
|
||||
sessionRule.session.evaluateJS(userAgentJs) as String,
|
||||
containsString(mobileSubStr))
|
||||
|
||||
sessionRule.session.settings.setBoolean(
|
||||
GeckoSessionSettings.USE_DESKTOP_MODE, true)
|
||||
|
||||
sessionRule.session.reload()
|
||||
sessionRule.session.waitForPageStop()
|
||||
|
||||
assertThat("User agent should be set to desktop",
|
||||
sessionRule.session.evaluateJS(userAgentJs) as String,
|
||||
containsString(desktopSubStr))
|
||||
|
||||
sessionRule.session.settings.setBoolean(
|
||||
GeckoSessionSettings.USE_DESKTOP_MODE, false)
|
||||
|
||||
sessionRule.session.reload()
|
||||
sessionRule.session.waitForPageStop()
|
||||
|
||||
assertThat("User agent should be set to mobile",
|
||||
sessionRule.session.evaluateJS(userAgentJs) as String,
|
||||
containsString(mobileSubStr))
|
||||
}
|
||||
|
||||
@Test fun load() {
|
||||
sessionRule.session.loadTestPath(HELLO_HTML_PATH)
|
||||
sessionRule.waitForPageStop()
|
||||
|
|
|
|||
|
|
@ -89,11 +89,13 @@ class GeckoViewSettings extends GeckoViewModule {
|
|||
return;
|
||||
}
|
||||
if (aUse) {
|
||||
Services.obs.addObserver(this.onUserAgentRequest.bind(this),
|
||||
this._userAgentObserver = this.onUserAgentRequest.bind(this);
|
||||
Services.obs.addObserver(this._userAgentObserver,
|
||||
"http-on-useragent-request");
|
||||
} else {
|
||||
Services.obs.removeObserver(this.onUserAgentRequest.bind(this),
|
||||
} else if (this._userAgentObserver) {
|
||||
Services.obs.removeObserver(this._userAgentObserver,
|
||||
"http-on-useragent-request");
|
||||
this._userAgentObserver = undefined;
|
||||
}
|
||||
this._useDesktopMode = aUse;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -278,7 +278,7 @@ VARCACHE_PREF(
|
|||
VARCACHE_PREF(
|
||||
"layout.css.font-variations.enabled",
|
||||
layout_css_font_variations_enabled,
|
||||
bool, true
|
||||
RelaxedAtomicBool, true
|
||||
)
|
||||
|
||||
// Are we emulating -moz-{inline}-box layout using CSS flexbox?
|
||||
|
|
|
|||
|
|
@ -323,7 +323,7 @@ macro_rules! is_descriptor_enabled {
|
|||
("font-variation-settings") => {
|
||||
unsafe {
|
||||
use gecko_bindings::structs::mozilla;
|
||||
mozilla::StaticPrefs_sVarCache_layout_css_font_variations_enabled
|
||||
mozilla::StaticPrefs_sVarCache_layout_css_font_variations_enabled != 0
|
||||
}
|
||||
};
|
||||
($name:tt) => {
|
||||
|
|
|
|||
|
|
@ -101,6 +101,7 @@ test-verify:
|
|||
# do not run on ccov or jsdcov
|
||||
.*-ccov/.*: []
|
||||
.*-jsdcov/.*: []
|
||||
.*-asan/.*: []
|
||||
# do not run on beta or release: usually just confirms earlier results
|
||||
default: ['trunk', 'try']
|
||||
tier: 2
|
||||
|
|
@ -141,6 +142,7 @@ test-verify-gpu:
|
|||
# do not run on ccov or jsdcov
|
||||
.*-ccov/.*: []
|
||||
.*-jsdcov/.*: []
|
||||
.*-asan/.*: []
|
||||
# do not run on beta or release: usually just confirms earlier results
|
||||
default: ['trunk', 'try']
|
||||
tier: 2
|
||||
|
|
|
|||
|
|
@ -144,6 +144,7 @@ test-verify-wpt:
|
|||
# do not run on ccov or jsdcov
|
||||
.*-ccov/.*: []
|
||||
.*-jsdcov/.*: []
|
||||
.*-asan/.*: []
|
||||
# do not run on beta or release: usually just confirms earlier results
|
||||
default: ['trunk', 'try']
|
||||
tier: 2
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
{
|
||||
"work_dir": ".",
|
||||
"log_name": "multilocale",
|
||||
"objdir": "obj-firefox",
|
||||
"locales_file": "build/configs/mozilla/l10n-changesets_mobile-beta.json",
|
||||
"locales_platform": "android-multilocale",
|
||||
"locales_dir": "mobile/android/locales",
|
||||
"ignore_locales": ["en-US", "multi"],
|
||||
"vcs_share_base": "/builds/hg-shared",
|
||||
"hg_l10n_base": "https://hg.mozilla.org/",
|
||||
"required_config_vars": ["tag_override"],
|
||||
"l10n_dir": "mozilla-beta",
|
||||
"mozilla_dir": "build",
|
||||
"mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/release"
|
||||
}
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
{
|
||||
"work_dir": ".",
|
||||
"log_name": "multilocale",
|
||||
"objdir": "obj-firefox",
|
||||
"locales_file": "build/configs/mozilla/l10n-changesets_mobile-beta.json",
|
||||
"locales_platform": "android-multilocale",
|
||||
"locales_dir": "mobile/android/locales",
|
||||
"ignore_locales": ["en-US", "multi"],
|
||||
"vcs_share_base": "/builds/hg-shared",
|
||||
"hg_l10n_base": "https://hg.mozilla.org/",
|
||||
"required_config_vars": ["tag_override"],
|
||||
"l10n_dir": "mozilla-beta",
|
||||
"mozilla_dir": "build",
|
||||
"mozconfig": "build/mobile/android/config/mozconfigs/android-x86/release"
|
||||
}
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
{
|
||||
"work_dir": ".",
|
||||
"log_name": "multilocale",
|
||||
"objdir": "obj-firefox",
|
||||
"locales_file": "build/configs/mozilla/l10n-changesets_mobile-beta.json",
|
||||
"locales_platform": "android-multilocale",
|
||||
"locales_dir": "mobile/android/locales",
|
||||
"ignore_locales": ["en-US", "multi"],
|
||||
"vcs_share_base": "/builds/hg-shared",
|
||||
"hg_l10n_base": "https://hg.mozilla.org/",
|
||||
"required_config_vars": ["tag_override"],
|
||||
"l10n_dir": "mozilla-beta",
|
||||
"mozilla_dir": "build"
|
||||
}
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
{
|
||||
"work_dir": ".",
|
||||
"log_name": "multilocale",
|
||||
"objdir": "obj-firefox",
|
||||
"locales_file": "build/configs/mozilla/l10n-changesets_mobile-release.json",
|
||||
"locales_platform": "android-multilocale",
|
||||
"locales_dir": "mobile/android/locales",
|
||||
"ignore_locales": ["en-US", "multi"],
|
||||
"vcs_share_base": "/builds/hg-shared",
|
||||
"hg_l10n_base": "https://hg.mozilla.org/",
|
||||
"required_config_vars": ["tag_override"],
|
||||
"l10n_dir": "mozilla-release",
|
||||
"mozilla_dir": "build",
|
||||
"mozconfig": "build/mobile/android/config/mozconfigs/android-armv6/release"
|
||||
}
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
{
|
||||
"work_dir": ".",
|
||||
"log_name": "multilocale",
|
||||
"objdir": "obj-firefox",
|
||||
"locales_file": "build/configs/mozilla/l10n-changesets_mobile-release.json",
|
||||
"locales_platform": "android-multilocale",
|
||||
"locales_dir": "mobile/android/locales",
|
||||
"ignore_locales": ["en-US", "multi"],
|
||||
"vcs_share_base": "/builds/hg-shared",
|
||||
"hg_l10n_base": "https://hg.mozilla.org/",
|
||||
"required_config_vars": ["tag_override"],
|
||||
"l10n_dir": "mozilla-release",
|
||||
"mozilla_dir": "build",
|
||||
"mozconfig": "build/mobile/android/config/mozconfigs/android-x86/release"
|
||||
}
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
{
|
||||
"work_dir": ".",
|
||||
"log_name": "multilocale",
|
||||
"objdir": "obj-firefox",
|
||||
"locales_file": "build/configs/mozilla/l10n-changesets_mobile-release.json",
|
||||
"locales_platform": "android-multilocale",
|
||||
"locales_dir": "mobile/android/locales",
|
||||
"ignore_locales": ["en-US", "multi"],
|
||||
"vcs_share_base": "/builds/hg-shared",
|
||||
"hg_l10n_base": "https://hg.mozilla.org/",
|
||||
"required_config_vars": ["tag_override"],
|
||||
"l10n_dir": "mozilla-release",
|
||||
"mozilla_dir": "build"
|
||||
}
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
|
||||
import os
|
||||
# The name of the directory we'll pull our source into.
|
||||
BUILD_DIR = "mozilla-central"
|
||||
# This is where the l10n repos are (everything after https://hg.mozilla.org/)
|
||||
# for mozilla-central, that's "l10n-central".
|
||||
# For mozilla-aurora, that's "releases/l10n/mozilla-aurora"
|
||||
L10N_REPO_PATH = "l10n-central"
|
||||
# Currently this is assumed to be a subdirectory of your build dir
|
||||
OBJDIR = "objdir-droid"
|
||||
# Absolute path to your mozconfig.
|
||||
# By default it looks at "./mozconfig"
|
||||
MOZCONFIG = os.path.join(os.getcwd(), "mozconfig")
|
||||
|
||||
config = {
|
||||
"work_dir": ".",
|
||||
"log_name": "multilocale",
|
||||
"objdir": OBJDIR,
|
||||
"locales_file": "%s/mobile/locales/l10n-changesets.json" % BUILD_DIR,
|
||||
"locales_platform": "android-multilocale",
|
||||
"locales_dir": "mobile/android/locales",
|
||||
"ignore_locales": ["en-US", "multi"],
|
||||
"vcs_share_base": "/builds/hg-shared",
|
||||
"l10n_repos": [],
|
||||
"hg_l10n_base": "https://hg.mozilla.org/%s" % L10N_REPO_PATH,
|
||||
"hg_l10n_tag": "default",
|
||||
"l10n_dir": "l10n",
|
||||
"mozilla_dir": BUILD_DIR,
|
||||
"mozconfig": MOZCONFIG,
|
||||
"default_actions": [
|
||||
"pull-locale-source",
|
||||
"build",
|
||||
"package-en-US",
|
||||
"backup-objdir",
|
||||
"restore-objdir",
|
||||
"add-locales",
|
||||
"android-assemble-app",
|
||||
"package-multi",
|
||||
"summary",
|
||||
],
|
||||
}
|
||||
|
|
@ -1,27 +1,8 @@
|
|||
# This configuration uses mozilla-central binaries (en-US, localized complete
|
||||
# mars) and urls but it generates 'alder' artifacts. With this setup, binaries
|
||||
# generated on alder are NOT overwriting mozilla-central files.
|
||||
# Using this configuration, on a successful build, artifacts will be uploaded
|
||||
# here:
|
||||
#
|
||||
# * http://dev-stage01.srv.releng.scl3.mozilla.com/pub/mozilla.org/firefox/nightly/latest-alder-l10n/
|
||||
# (in staging environment)
|
||||
# * https://ftp.mozilla.org/pub/firefox/nightly/latest-alder-l10n/
|
||||
# (in production environment)
|
||||
#
|
||||
# If you really want to have localized alder builds, use the use the following
|
||||
# values:
|
||||
# * "en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/alder-%(platform)s/latest/",
|
||||
# * "mar_tools_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/alder-%(platform)s/latest/",
|
||||
# * "repo": "https://hg.mozilla.org/projects/alder",
|
||||
#
|
||||
|
||||
import os
|
||||
|
||||
config = {
|
||||
"nightly_build": True,
|
||||
"branch": "alder",
|
||||
"en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central/",
|
||||
"update_channel": "nightly",
|
||||
|
||||
# l10n
|
||||
|
|
|
|||
|
|
@ -1,27 +1,8 @@
|
|||
# This configuration uses mozilla-central binaries (en-US, localized complete
|
||||
# mars) and urls but it generates 'ash' artifacts. With this setup, binaries
|
||||
# generated on ash are NOT overwriting mozilla-central files.
|
||||
# Using this configuration, on a successful build, artifacts will be uploaded
|
||||
# here:
|
||||
#
|
||||
# * http://dev-stage01.srv.releng.scl3.mozilla.com/pub/mozilla.org/firefox/nightly/latest-ash-l10n/
|
||||
# (in staging environment)
|
||||
# * https://ftp.mozilla.org/pub/firefox/nightly/latest-ash-l10n/
|
||||
# (in production environment)
|
||||
#
|
||||
# If you really want to have localized ash builds, use the use the following
|
||||
# values:
|
||||
# * "en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/ash-%(platform)s/latest/",
|
||||
# * "mar_tools_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/ash-%(platform)s/latest/",
|
||||
# * "repo": "https://hg.mozilla.org/projects/ash",
|
||||
#
|
||||
|
||||
import os
|
||||
|
||||
config = {
|
||||
"nightly_build": True,
|
||||
"branch": "ash",
|
||||
"en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central/",
|
||||
"update_channel": "nightly",
|
||||
|
||||
# l10n
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
import os
|
||||
|
||||
BRANCH = "ash"
|
||||
MOZ_UPDATE_CHANNEL = "nightly"
|
||||
MOZILLA_DIR = BRANCH
|
||||
OBJDIR = "obj-firefox"
|
||||
EN_US_BINARY_URL = "http://archive.mozilla.org/pub/mobile/nightly/latest-%s-android-api-16/en-US" % BRANCH
|
||||
HG_SHARE_BASE_DIR = "/builds/hg-shared"
|
||||
|
||||
config = {
|
||||
|
|
@ -10,7 +11,6 @@ config = {
|
|||
"log_name": "single_locale",
|
||||
"objdir": OBJDIR,
|
||||
"is_automation": True,
|
||||
"locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
|
||||
"locales_dir": "mobile/android/locales",
|
||||
"ignore_locales": ["en-US"],
|
||||
"nightly_build": True,
|
||||
|
|
@ -27,11 +27,9 @@ config = {
|
|||
# so ugly, bug 951238
|
||||
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
|
||||
"MOZ_OBJDIR": OBJDIR,
|
||||
"EN_US_BINARY_URL": EN_US_BINARY_URL,
|
||||
"EN_US_BINARY_URL": os.environ['EN_US_BINARY_URL'],
|
||||
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
|
||||
},
|
||||
"upload_branch": "%s-android-api-16" % BRANCH,
|
||||
"platform": "android",
|
||||
|
||||
# Balrog
|
||||
"build_target": "Android_arm-eabi-gcc3",
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ import os
|
|||
config = {
|
||||
"nightly_build": True,
|
||||
"branch": "mozilla-central",
|
||||
"en_us_binary_url": "http://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central",
|
||||
"update_channel": "nightly",
|
||||
|
||||
# l10n
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ BRANCH = "autoland"
|
|||
MOZ_UPDATE_CHANNEL = "nightly"
|
||||
MOZILLA_DIR = BRANCH
|
||||
OBJDIR = "obj-firefox"
|
||||
EN_US_BINARY_URL = "http://archive.mozilla.org/pub/mobile/nightly/latest-%s-android-api-16/en-US" % BRANCH
|
||||
HG_SHARE_BASE_DIR = "/builds/hg-shared"
|
||||
|
||||
config = {
|
||||
|
|
@ -12,7 +11,6 @@ config = {
|
|||
"log_name": "single_locale",
|
||||
"objdir": OBJDIR,
|
||||
"is_automation": True,
|
||||
"locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
|
||||
"locales_dir": "mobile/android/locales",
|
||||
"ignore_locales": ["en-US"],
|
||||
"nightly_build": True,
|
||||
|
|
@ -29,11 +27,9 @@ config = {
|
|||
# so ugly, bug 951238
|
||||
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
|
||||
"MOZ_OBJDIR": OBJDIR,
|
||||
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
|
||||
"EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
|
||||
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
|
||||
},
|
||||
"upload_branch": "%s-android-api-16" % BRANCH,
|
||||
"platform": "android",
|
||||
|
||||
# Balrog
|
||||
"build_target": "Android_arm-eabi-gcc3",
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
config = {
|
||||
"branch": "jamun",
|
||||
"nightly_build": True,
|
||||
"update_channel": "beta",
|
||||
|
||||
# l10n
|
||||
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
|
||||
|
||||
# purge options
|
||||
'is_automation': True,
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
config = {
|
||||
"branch": "jamun",
|
||||
"nightly_build": True,
|
||||
"update_channel": "release",
|
||||
|
||||
# l10n
|
||||
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
|
||||
|
||||
# purge options
|
||||
'is_automation': True,
|
||||
}
|
||||
|
|
@ -3,7 +3,6 @@ import os
|
|||
config = {
|
||||
"nightly_build": True,
|
||||
"branch": "jamun",
|
||||
"en_us_binary_url": "http://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central",
|
||||
"update_channel": "nightly-jamun",
|
||||
|
||||
# l10n
|
||||
|
|
|
|||
|
|
@ -2,14 +2,12 @@ import os
|
|||
|
||||
BRANCH = "jamun"
|
||||
MOZILLA_DIR = BRANCH
|
||||
EN_US_BINARY_URL = None # No build has been uploaded to archive.m.o
|
||||
|
||||
config = {
|
||||
"branch": BRANCH,
|
||||
"log_name": "single_locale",
|
||||
"objdir": "obj-firefox",
|
||||
"is_automation": True,
|
||||
"locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
|
||||
"locales_dir": "mobile/android/locales",
|
||||
"ignore_locales": ["en-US"],
|
||||
"nightly_build": True,
|
||||
|
|
@ -26,11 +24,9 @@ config = {
|
|||
# so ugly, bug 951238
|
||||
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
|
||||
"MOZ_OBJDIR": "obj-firefox",
|
||||
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
|
||||
"EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
|
||||
"MOZ_UPDATE_CHANNEL": "nightly-jamun",
|
||||
},
|
||||
"upload_branch": "%s-android-api-16" % BRANCH,
|
||||
"platform": "android",
|
||||
|
||||
# Balrog
|
||||
"build_target": "Android_arm-eabi-gcc3",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
config = {
|
||||
"platform": "linux",
|
||||
"app_name": "browser",
|
||||
"mozconfig_platform": "linux32",
|
||||
"mozconfig_variant": "l10n-mozconfig",
|
||||
|
|
@ -14,7 +13,6 @@ config = {
|
|||
"hg_l10n_tag": "default",
|
||||
|
||||
# MAR
|
||||
"application_ini": "application.ini",
|
||||
"local_mar_tool_dir": "dist/host/bin",
|
||||
"mar": "mar",
|
||||
"mbsdiff": "mbsdiff",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
config = {
|
||||
"platform": "linux64",
|
||||
"app_name": "browser",
|
||||
"mozconfig_platform": "linux64",
|
||||
"mozconfig_variant": "l10n-mozconfig",
|
||||
|
|
@ -9,12 +8,10 @@ config = {
|
|||
# l10n
|
||||
"ignore_locales": ["en-US", "ja-JP-mac"],
|
||||
"l10n_dir": "l10n",
|
||||
"locales_file": "src/browser/locales/all-locales",
|
||||
"locales_dir": "browser/locales",
|
||||
"hg_l10n_tag": "default",
|
||||
|
||||
# MAR
|
||||
"application_ini": "application.ini",
|
||||
"local_mar_tool_dir": "dist/host/bin",
|
||||
"mar": "mar",
|
||||
"mbsdiff": "mbsdiff",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
config = {
|
||||
"platform": "linux64",
|
||||
"app_name": "browser",
|
||||
"mozconfig_platform": "linux64",
|
||||
"mozconfig_variant": "l10n-mozconfig-devedition",
|
||||
|
|
@ -9,12 +8,10 @@ config = {
|
|||
# l10n
|
||||
"ignore_locales": ["en-US", "ja-JP-mac"],
|
||||
"l10n_dir": "l10n",
|
||||
"locales_file": "src/browser/locales/all-locales",
|
||||
"locales_dir": "browser/locales",
|
||||
"hg_l10n_tag": "default",
|
||||
|
||||
# MAR
|
||||
"application_ini": "application.ini",
|
||||
"local_mar_tool_dir": "dist/host/bin",
|
||||
"mar": "mar",
|
||||
"mbsdiff": "mbsdiff",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
config = {
|
||||
"platform": "linux",
|
||||
"app_name": "browser",
|
||||
"mozconfig_platform": "linux32",
|
||||
"mozconfig_variant": "l10n-mozconfig-devedition",
|
||||
|
|
@ -9,12 +8,10 @@ config = {
|
|||
# l10n
|
||||
"ignore_locales": ["en-US", "ja-JP-mac"],
|
||||
"l10n_dir": "l10n",
|
||||
"locales_file": "src/browser/locales/all-locales",
|
||||
"locales_dir": "browser/locales",
|
||||
"hg_l10n_tag": "default",
|
||||
|
||||
# MAR
|
||||
"application_ini": "application.ini",
|
||||
"local_mar_tool_dir": "dist/host/bin",
|
||||
"mar": "mar",
|
||||
"mbsdiff": "mbsdiff",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
config = {
|
||||
# mozconfig file to use, it depends on branch and platform names
|
||||
"platform": "macosx64",
|
||||
"app_name": "browser",
|
||||
"mozconfig_platform": "macosx64",
|
||||
"mozconfig_variant": "l10n-mozconfig",
|
||||
|
|
@ -14,12 +13,10 @@ config = {
|
|||
# l10n
|
||||
"ignore_locales": ["en-US", "ja"],
|
||||
"l10n_dir": "l10n",
|
||||
"locales_file": "src/browser/locales/all-locales",
|
||||
"locales_dir": "browser/locales",
|
||||
"hg_l10n_tag": "default",
|
||||
|
||||
# MAR
|
||||
"application_ini": "Contents/Resources/application.ini",
|
||||
"local_mar_tool_dir": "dist/host/bin",
|
||||
"mar": "mar",
|
||||
"mbsdiff": "mbsdiff",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
config = {
|
||||
# mozconfig file to use, it depends on branch and platform names
|
||||
"platform": "macosx64",
|
||||
"app_name": "browser",
|
||||
"mozconfig_platform": "macosx64",
|
||||
"mozconfig_variant": "l10n-mozconfig-devedition",
|
||||
|
|
@ -15,12 +14,10 @@ config = {
|
|||
# l10n
|
||||
"ignore_locales": ["en-US", "ja"],
|
||||
"l10n_dir": "l10n",
|
||||
"locales_file": "src/browser/locales/all-locales",
|
||||
"locales_dir": "browser/locales",
|
||||
"hg_l10n_tag": "default",
|
||||
|
||||
# MAR
|
||||
"application_ini": "Contents/Resources/application.ini",
|
||||
"local_mar_tool_dir": "dist/host/bin",
|
||||
"mar": "mar",
|
||||
"mbsdiff": "mbsdiff",
|
||||
|
|
|
|||
|
|
@ -2,15 +2,12 @@ import os
|
|||
|
||||
BRANCH = "maple"
|
||||
MOZILLA_DIR = BRANCH
|
||||
EN_US_BINARY_URL = "http://archive.mozilla.org/pub/" \
|
||||
"mobile/nightly/latest-maple-android-api-16/en-US"
|
||||
|
||||
config = {
|
||||
"branch": BRANCH,
|
||||
"log_name": "single_locale",
|
||||
"objdir": "obj-firefox",
|
||||
"is_automation": True,
|
||||
"locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
|
||||
"locales_dir": "mobile/android/locales",
|
||||
"ignore_locales": ["en-US"],
|
||||
"nightly_build": True,
|
||||
|
|
@ -27,11 +24,9 @@ config = {
|
|||
# so ugly, bug 951238
|
||||
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
|
||||
"MOZ_OBJDIR": "obj-firefox",
|
||||
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
|
||||
"EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
|
||||
"MOZ_UPDATE_CHANNEL": "nightly-maple",
|
||||
},
|
||||
"upload_branch": "%s-android-api-16" % BRANCH,
|
||||
"platform": "android",
|
||||
|
||||
# Balrog
|
||||
"build_target": "Android_arm-eabi-gcc3",
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ import os
|
|||
config = {
|
||||
"nightly_build": True,
|
||||
"branch": "mozilla-aurora",
|
||||
"en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-aurora/",
|
||||
"update_channel": "aurora",
|
||||
|
||||
# l10n
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ BRANCH = "mozilla-aurora"
|
|||
MOZ_UPDATE_CHANNEL = "aurora"
|
||||
MOZILLA_DIR = BRANCH
|
||||
OBJDIR = "obj-firefox"
|
||||
EN_US_BINARY_URL = "http://archive.mozilla.org/pub/mobile/nightly/latest-%s-android-api-16/en-US" % BRANCH
|
||||
HG_SHARE_BASE_DIR = "/builds/hg-shared"
|
||||
|
||||
config = {
|
||||
|
|
@ -12,7 +11,6 @@ config = {
|
|||
"log_name": "single_locale",
|
||||
"objdir": OBJDIR,
|
||||
"is_automation": True,
|
||||
"locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
|
||||
"locales_dir": "mobile/android/locales",
|
||||
"ignore_locales": ["en-US"],
|
||||
"nightly_build": True,
|
||||
|
|
@ -29,11 +27,9 @@ config = {
|
|||
# so ugly, bug 951238
|
||||
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
|
||||
"MOZ_OBJDIR": OBJDIR,
|
||||
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
|
||||
"EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
|
||||
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
|
||||
},
|
||||
"upload_branch": "%s-android-api-16" % BRANCH,
|
||||
"platform": "android",
|
||||
|
||||
# Balrog
|
||||
"build_target": "Android_arm-eabi-gcc3",
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ import os
|
|||
config = {
|
||||
"nightly_build": True,
|
||||
"branch": "mozilla-beta",
|
||||
"en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-beta/",
|
||||
"update_channel": "beta",
|
||||
|
||||
# l10n
|
||||
|
|
|
|||
|
|
@ -11,11 +11,8 @@ config = {
|
|||
"log_name": "single_locale",
|
||||
"objdir": OBJDIR,
|
||||
"is_automation": True,
|
||||
"locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
|
||||
"locales_dir": "mobile/android/locales",
|
||||
"locales_platform": "android-api-16",
|
||||
"ignore_locales": ["en-US"],
|
||||
"platform": "android",
|
||||
"build_target": "Android_arm-eabi-gcc3",
|
||||
"tooltool_config": {
|
||||
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
|
||||
|
|
@ -29,9 +26,8 @@ config = {
|
|||
"repack_env": {
|
||||
# so ugly, bug 951238
|
||||
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
|
||||
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
|
||||
"EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
|
||||
"MOZ_OBJDIR": OBJDIR,
|
||||
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
|
||||
},
|
||||
"upload_branch": "%s-android-api-16" % BRANCH,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
config = {
|
||||
"nightly_build": True,
|
||||
"branch": "mozilla-beta",
|
||||
"en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-beta/",
|
||||
"update_channel": "aurora", # devedition uses aurora based branding
|
||||
|
||||
# l10n
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ import os
|
|||
config = {
|
||||
"nightly_build": True,
|
||||
"branch": "mozilla-central",
|
||||
"en_us_binary_url": "http://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central",
|
||||
"update_channel": "nightly",
|
||||
|
||||
# l10n
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ BRANCH = "mozilla-central"
|
|||
MOZ_UPDATE_CHANNEL = "nightly"
|
||||
MOZILLA_DIR = BRANCH
|
||||
OBJDIR = "obj-firefox"
|
||||
EN_US_BINARY_URL = "http://archive.mozilla.org/pub/mobile/nightly/latest-%s-android-api-16/en-US" % BRANCH
|
||||
HG_SHARE_BASE_DIR = "/builds/hg-shared"
|
||||
|
||||
config = {
|
||||
|
|
@ -12,7 +11,6 @@ config = {
|
|||
"log_name": "single_locale",
|
||||
"objdir": OBJDIR,
|
||||
"is_automation": True,
|
||||
"locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
|
||||
"locales_dir": "mobile/android/locales",
|
||||
"ignore_locales": ["en-US"],
|
||||
"nightly_build": True,
|
||||
|
|
@ -29,11 +27,9 @@ config = {
|
|||
# so ugly, bug 951238
|
||||
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
|
||||
"MOZ_OBJDIR": OBJDIR,
|
||||
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
|
||||
"EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
|
||||
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
|
||||
},
|
||||
"upload_branch": "%s-android-api-16" % BRANCH,
|
||||
"platform": "android",
|
||||
|
||||
# Balrog
|
||||
"build_target": "Android_arm-eabi-gcc3",
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
# This config references releases/l10n/mozilla-release instead of l10n-central
|
||||
# because 52 predates cross-channel localization, which rides the train
|
||||
# with 57.
|
||||
# If you copy this config for the ESR following 57, change hg_l10n_base
|
||||
# to l10n-central.
|
||||
config = {
|
||||
"nightly_build": True,
|
||||
"branch": "mozilla-esr52",
|
||||
"en_us_binary_url": "https://archive.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-esr52/",
|
||||
"update_channel": "esr",
|
||||
|
||||
# l10n
|
||||
"hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-release",
|
||||
|
||||
# purge options
|
||||
'is_automation': True,
|
||||
}
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
import os
|
||||
|
||||
config = {
|
||||
"nightly_build": True,
|
||||
"branch": "mozilla-esr60",
|
||||
"en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-esr60/",
|
||||
"update_channel": "esr",
|
||||
|
||||
# l10n
|
||||
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",
|
||||
|
||||
# mar
|
||||
"mar_tools_url": os.environ["MAR_TOOLS_URL"],
|
||||
|
||||
# purge options
|
||||
'is_automation': True,
|
||||
}
|
||||
|
|
@ -3,7 +3,6 @@ import os
|
|||
config = {
|
||||
"nightly_build": True,
|
||||
"branch": "mozilla-inbound",
|
||||
"en_us_binary_url": "http://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central",
|
||||
"update_channel": "nightly",
|
||||
|
||||
# l10n
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ BRANCH = "mozilla-inbound"
|
|||
MOZ_UPDATE_CHANNEL = "default"
|
||||
MOZILLA_DIR = BRANCH
|
||||
OBJDIR = "obj-firefox"
|
||||
EN_US_BINARY_URL = "http://archive.mozilla.org/pub/mobile/nightly/latest-%s-android-api-16/en-US" % BRANCH
|
||||
HG_SHARE_BASE_DIR = "/builds/hg-shared"
|
||||
|
||||
config = {
|
||||
|
|
@ -12,7 +11,6 @@ config = {
|
|||
"log_name": "single_locale",
|
||||
"objdir": OBJDIR,
|
||||
"is_automation": True,
|
||||
"locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
|
||||
"locales_dir": "mobile/android/locales",
|
||||
"ignore_locales": ["en-US"],
|
||||
"nightly_build": True,
|
||||
|
|
@ -29,11 +27,9 @@ config = {
|
|||
# so ugly, bug 951238
|
||||
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
|
||||
"MOZ_OBJDIR": OBJDIR,
|
||||
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
|
||||
"EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
|
||||
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
|
||||
},
|
||||
"upload_branch": "%s-android-api-16" % BRANCH,
|
||||
"platform": "android",
|
||||
|
||||
# Balrog
|
||||
"build_target": "Android_arm-eabi-gcc3",
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ import os
|
|||
config = {
|
||||
"nightly_build": True,
|
||||
"branch": "mozilla-release",
|
||||
"en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-release/",
|
||||
"update_channel": "release",
|
||||
|
||||
# l10n
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ BRANCH = "mozilla-release"
|
|||
MOZ_UPDATE_CHANNEL = "release"
|
||||
MOZILLA_DIR = BRANCH
|
||||
OBJDIR = "obj-firefox"
|
||||
EN_US_BINARY_URL = None
|
||||
HG_SHARE_BASE_DIR = "/builds/hg-shared"
|
||||
|
||||
config = {
|
||||
|
|
@ -11,11 +10,8 @@ config = {
|
|||
"log_name": "single_locale",
|
||||
"objdir": OBJDIR,
|
||||
"is_automation": True,
|
||||
"locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
|
||||
"locales_dir": "mobile/android/locales",
|
||||
"locales_platform": "android-api-16",
|
||||
"ignore_locales": ["en-US"],
|
||||
"platform": "android",
|
||||
"build_target": "Android_arm-eabi-gcc3",
|
||||
"tooltool_config": {
|
||||
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
|
||||
|
|
@ -29,9 +25,8 @@ config = {
|
|||
"repack_env": {
|
||||
# so ugly, bug 951238
|
||||
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
|
||||
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
|
||||
"EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
|
||||
"MOZ_OBJDIR": OBJDIR,
|
||||
"MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
|
||||
},
|
||||
"upload_branch": "%s-android-api-16" % BRANCH,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
config = {
|
||||
"locales_file": "src/mobile/locales/l10n-changesets.json",
|
||||
"mozconfig": "src/mobile/android/config/mozconfigs/android-api-16/l10n-nightly",
|
||||
"tooltool_config": {
|
||||
"manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
|
||||
|
|
|
|||
|
|
@ -1,13 +1,10 @@
|
|||
import os
|
||||
|
||||
EN_US_BINARY_URL = "%(en_us_binary_url)s"
|
||||
|
||||
config = {
|
||||
"locales_file": "src/browser/locales/all-locales",
|
||||
"bootstrap_env": {
|
||||
"NO_MERCURIAL_SETUP_CHECK": "1",
|
||||
"MOZ_OBJDIR": "obj-firefox",
|
||||
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
|
||||
"EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
|
||||
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
|
||||
"DIST": "%(abs_objdir)s",
|
||||
"L10NBASEDIR": "../../l10n",
|
||||
|
|
|
|||
|
|
@ -1,13 +1,10 @@
|
|||
import os
|
||||
|
||||
EN_US_BINARY_URL = "%(en_us_binary_url)s"
|
||||
|
||||
config = {
|
||||
"locales_file": "src/browser/locales/all-locales",
|
||||
"bootstrap_env": {
|
||||
"NO_MERCURIAL_SETUP_CHECK": "1",
|
||||
"MOZ_OBJDIR": "obj-firefox",
|
||||
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
|
||||
"EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
|
||||
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
|
||||
"DIST": "%(abs_objdir)s",
|
||||
"L10NBASEDIR": "../../l10n",
|
||||
|
|
|
|||
|
|
@ -1,13 +1,10 @@
|
|||
import os
|
||||
|
||||
EN_US_BINARY_URL = "%(en_us_binary_url)s"
|
||||
|
||||
config = {
|
||||
"locales_file": "src/browser/locales/all-locales",
|
||||
"bootstrap_env": {
|
||||
"NO_MERCURIAL_SETUP_CHECK": "1",
|
||||
"MOZ_OBJDIR": "obj-firefox",
|
||||
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
|
||||
"EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
|
||||
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
|
||||
"DIST": "%(abs_objdir)s",
|
||||
"L10NBASEDIR": "../../l10n",
|
||||
|
|
|
|||
|
|
@ -1,18 +1,14 @@
|
|||
import os
|
||||
|
||||
EN_US_BINARY_URL = "%(en_us_binary_url)s"
|
||||
|
||||
config = {
|
||||
"locales_file": "src/browser/locales/all-locales",
|
||||
'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
|
||||
"bootstrap_env": {
|
||||
"NO_MERCURIAL_SETUP_CHECK": "1",
|
||||
"MOZ_OBJDIR": "obj-firefox",
|
||||
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
|
||||
"EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
|
||||
# EN_US_INSTALLER_BINARY_URL falls back on EN_US_BINARY_URL
|
||||
"EN_US_INSTALLER_BINARY_URL": os.environ.get(
|
||||
"EN_US_INSTALLER_BINARY_URL", os.environ.get(
|
||||
"EN_US_BINARY_URL", EN_US_BINARY_URL)),
|
||||
"EN_US_INSTALLER_BINARY_URL", os.environ["EN_US_BINARY_URL"]),
|
||||
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
|
||||
"DIST": "%(abs_objdir)s",
|
||||
"L10NBASEDIR": "../../l10n",
|
||||
|
|
|
|||
|
|
@ -1,18 +1,14 @@
|
|||
import os
|
||||
|
||||
EN_US_BINARY_URL = "%(en_us_binary_url)s"
|
||||
|
||||
config = {
|
||||
"locales_file": "src/browser/locales/all-locales",
|
||||
'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
|
||||
"bootstrap_env": {
|
||||
"NO_MERCURIAL_SETUP_CHECK": "1",
|
||||
"MOZ_OBJDIR": "obj-firefox",
|
||||
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
|
||||
"EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
|
||||
# EN_US_INSTALLER_BINARY_URL falls back on EN_US_BINARY_URL
|
||||
"EN_US_INSTALLER_BINARY_URL": os.environ.get(
|
||||
"EN_US_INSTALLER_BINARY_URL", os.environ.get(
|
||||
"EN_US_BINARY_URL", EN_US_BINARY_URL)),
|
||||
"EN_US_INSTALLER_BINARY_URL", os.environ["EN_US_BINARY_URL"]),
|
||||
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
|
||||
"DIST": "%(abs_objdir)s",
|
||||
"L10NBASEDIR": "../../l10n",
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ import os
|
|||
config = {
|
||||
"nightly_build": False,
|
||||
"branch": "try",
|
||||
"en_us_binary_url": "http://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central",
|
||||
"update_channel": "nightly-try",
|
||||
|
||||
# l10n
|
||||
|
|
|
|||
|
|
@ -2,15 +2,12 @@ import os
|
|||
|
||||
BRANCH = "try"
|
||||
MOZILLA_DIR = BRANCH
|
||||
EN_US_BINARY_URL = "http://archive.mozilla.org/pub/" \
|
||||
"mobile/nightly/latest-mozilla-central-android-api-16/en-US"
|
||||
|
||||
config = {
|
||||
"branch": "try",
|
||||
"log_name": "single_locale",
|
||||
"objdir": "obj-firefox",
|
||||
"is_automation": True,
|
||||
"locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
|
||||
"locales_dir": "mobile/android/locales",
|
||||
"ignore_locales": ["en-US"],
|
||||
"tooltool_config": {
|
||||
|
|
@ -27,11 +24,9 @@ config = {
|
|||
# so ugly, bug 951238
|
||||
"LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
|
||||
"MOZ_OBJDIR": "obj-firefox",
|
||||
"EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
|
||||
"EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
|
||||
"MOZ_UPDATE_CHANNEL": "try", # XXX Invalid
|
||||
},
|
||||
"upload_branch": "%s-android-api-16" % BRANCH,
|
||||
"platform": "android", # XXX Validate
|
||||
|
||||
# Balrog
|
||||
"build_target": "Android_arm-eabi-gcc3",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
config = {
|
||||
"platform": "win32",
|
||||
"app_name": "browser",
|
||||
"mozconfig_platform": "win32",
|
||||
"mozconfig_variant": "l10n-mozconfig",
|
||||
|
|
@ -14,12 +13,10 @@ config = {
|
|||
# l10n
|
||||
"ignore_locales": ["en-US", "ja-JP-mac"],
|
||||
"l10n_dir": "l10n",
|
||||
"locales_file": "src/browser/locales/all-locales",
|
||||
"locales_dir": "browser/locales",
|
||||
"hg_l10n_tag": "default",
|
||||
|
||||
# MAR
|
||||
"application_ini": "application.ini",
|
||||
"local_mar_tool_dir": "dist\\host\\bin",
|
||||
"mar": "mar.exe",
|
||||
"mbsdiff": "mbsdiff.exe",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
config = {
|
||||
"platform": "win32",
|
||||
"app_name": "browser",
|
||||
"mozconfig_platform": "win32",
|
||||
"mozconfig_variant": "l10n-mozconfig-devedition",
|
||||
|
|
@ -13,12 +12,10 @@ config = {
|
|||
# l10n
|
||||
"ignore_locales": ["en-US", "ja-JP-mac"],
|
||||
"l10n_dir": "l10n",
|
||||
"locales_file": "src/browser/locales/all-locales",
|
||||
"locales_dir": "browser/locales",
|
||||
"hg_l10n_tag": "default",
|
||||
|
||||
# MAR
|
||||
"application_ini": "application.ini",
|
||||
"local_mar_tool_dir": "dist\\host\\bin",
|
||||
"mar": "mar.exe",
|
||||
"mbsdiff": "mbsdiff.exe",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
config = {
|
||||
"platform": "win64",
|
||||
"app_name": "browser",
|
||||
"mozconfig_platform": "win64",
|
||||
"mozconfig_variant": "l10n-mozconfig",
|
||||
|
|
@ -13,12 +12,10 @@ config = {
|
|||
# l10n
|
||||
"ignore_locales": ["en-US", "ja-JP-mac"],
|
||||
"l10n_dir": "l10n",
|
||||
"locales_file": "src/browser/locales/all-locales",
|
||||
"locales_dir": "browser/locales",
|
||||
"hg_l10n_tag": "default",
|
||||
|
||||
# MAR
|
||||
"application_ini": "application.ini",
|
||||
"local_mar_tool_dir": "dist\\host\\bin",
|
||||
"mar": "mar.exe",
|
||||
"mbsdiff": "mbsdiff.exe",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
config = {
|
||||
"platform": "win64",
|
||||
"app_name": "browser",
|
||||
"mozconfig_platform": "win64",
|
||||
"mozconfig_variant": "l10n-mozconfig-devedition",
|
||||
|
|
@ -13,12 +12,10 @@ config = {
|
|||
# l10n
|
||||
"ignore_locales": ["en-US", "ja-JP-mac"],
|
||||
"l10n_dir": "l10n",
|
||||
"locales_file": "src/browser/locales/all-locales",
|
||||
"locales_dir": "browser/locales",
|
||||
"hg_l10n_tag": "default",
|
||||
|
||||
# MAR
|
||||
"application_ini": "application.ini",
|
||||
"local_mar_tool_dir": "dist\\host\\bin",
|
||||
"mar": "mar.exe",
|
||||
"mbsdiff": "mbsdiff.exe",
|
||||
|
|
|
|||
|
|
@ -8,12 +8,8 @@
|
|||
"""
|
||||
|
||||
import os
|
||||
from urlparse import urljoin
|
||||
import pprint
|
||||
import sys
|
||||
from copy import deepcopy
|
||||
|
||||
sys.path.insert(1, os.path.dirname(sys.path[0]))
|
||||
|
||||
from mozharness.base.config import parse_config_file
|
||||
|
||||
|
|
|
|||
|
|
@ -9,14 +9,12 @@
|
|||
This should be a mostly generic multilocale build script.
|
||||
"""
|
||||
|
||||
from copy import deepcopy
|
||||
import os
|
||||
import sys
|
||||
|
||||
sys.path.insert(1, os.path.dirname(os.path.dirname(sys.path[0])))
|
||||
|
||||
from mozharness.base.errors import MakefileErrorList, SSHErrorList
|
||||
from mozharness.base.log import FATAL
|
||||
from mozharness.base.errors import MakefileErrorList
|
||||
from mozharness.base.vcs.vcsbase import MercurialScript
|
||||
from mozharness.mozilla.l10n.locales import LocalesMixin
|
||||
|
||||
|
|
@ -76,54 +74,18 @@ class MultiLocaleBuild(LocalesMixin, MercurialScript):
|
|||
def __init__(self, require_config_file=True):
|
||||
LocalesMixin.__init__(self)
|
||||
MercurialScript.__init__(self, config_options=self.config_options,
|
||||
all_actions=['clobber',
|
||||
'pull-build-source',
|
||||
'pull-locale-source',
|
||||
'build',
|
||||
'package-en-US',
|
||||
'upload-en-US',
|
||||
'backup-objdir',
|
||||
'restore-objdir',
|
||||
all_actions=['pull-locale-source',
|
||||
'add-locales',
|
||||
'android-assemble-app',
|
||||
'package-multi',
|
||||
'upload-multi',
|
||||
'summary'],
|
||||
require_config_file=require_config_file)
|
||||
|
||||
def query_l10n_env(self):
|
||||
return self.query_env()
|
||||
|
||||
def clobber(self):
|
||||
c = self.config
|
||||
if c['work_dir'] != '.':
|
||||
path = os.path.join(c['base_work_dir'], c['work_dir'])
|
||||
if os.path.exists(path):
|
||||
self.rmtree(path, error_level=FATAL)
|
||||
else:
|
||||
self.info("work_dir is '.'; skipping for now.")
|
||||
|
||||
def pull_build_source(self):
|
||||
c = self.config
|
||||
repos = c['repos']
|
||||
self.vcs_checkout_repos(repos, tag_override=c.get('tag_override'))
|
||||
|
||||
# pull_locale_source() defined in LocalesMixin.
|
||||
|
||||
def build(self):
|
||||
c = self.config
|
||||
dirs = self.query_abs_dirs()
|
||||
self.copyfile(os.path.join(dirs['abs_work_dir'], c['mozconfig']),
|
||||
os.path.join(dirs['abs_mozilla_dir'], 'mozconfig'),
|
||||
error_level=FATAL)
|
||||
|
||||
mach = os.path.join(dirs['abs_mozilla_dir'], 'mach')
|
||||
env = self.query_env()
|
||||
if self._process_command(command=[sys.executable, mach, 'build'],
|
||||
cwd=dirs['abs_mozilla_dir'],
|
||||
env=env, error_list=MakefileErrorList):
|
||||
self.fatal("Erroring out after the build failed.")
|
||||
|
||||
def android_assemble_app(self):
|
||||
dirs = self.query_abs_dirs()
|
||||
|
||||
|
|
@ -135,7 +97,6 @@ class MultiLocaleBuild(LocalesMixin, MercurialScript):
|
|||
self.fatal("Erroring out after assembling Android APKs failed.")
|
||||
|
||||
def add_locales(self):
|
||||
c = self.config
|
||||
dirs = self.query_abs_dirs()
|
||||
locales = self.query_locales()
|
||||
|
||||
|
|
@ -151,9 +112,6 @@ class MultiLocaleBuild(LocalesMixin, MercurialScript):
|
|||
else:
|
||||
self.add_summary("Added locale %s successfully." % locale)
|
||||
|
||||
def package_en_US(self):
|
||||
self.package(package_type='en-US')
|
||||
|
||||
def preflight_package_multi(self):
|
||||
dirs = self.query_abs_dirs()
|
||||
self.run_command("rm -rfv dist/fennec*", cwd=dirs['abs_objdir'])
|
||||
|
|
@ -192,40 +150,6 @@ class MultiLocaleBuild(LocalesMixin, MercurialScript):
|
|||
halt_on_failure=True)
|
||||
self.additional_packaging(package_type=package_type, env=env)
|
||||
|
||||
def upload_en_US(self):
|
||||
# TODO
|
||||
self.info("Not written yet.")
|
||||
|
||||
def backup_objdir(self):
|
||||
dirs = self.query_abs_dirs()
|
||||
if not os.path.isdir(dirs['abs_objdir']):
|
||||
self.warning("%s doesn't exist! Skipping..." % dirs['abs_objdir'])
|
||||
return
|
||||
rsync = self.query_exe('rsync')
|
||||
backup_dir = '%s-bak' % dirs['abs_objdir']
|
||||
self.rmtree(backup_dir)
|
||||
self.mkdir_p(backup_dir)
|
||||
self.run_command([rsync, '-a', '--delete', '--partial',
|
||||
'%s/' % dirs['abs_objdir'],
|
||||
'%s/' % backup_dir],
|
||||
error_list=SSHErrorList)
|
||||
|
||||
def restore_objdir(self):
|
||||
dirs = self.query_abs_dirs()
|
||||
rsync = self.query_exe('rsync')
|
||||
backup_dir = '%s-bak' % dirs['abs_objdir']
|
||||
if not os.path.isdir(dirs['abs_objdir']) or not os.path.isdir(backup_dir):
|
||||
self.warning("Both %s and %s need to exist to restore the objdir! Skipping..." % (dirs['abs_objdir'], backup_dir))
|
||||
return
|
||||
self.run_command([rsync, '-a', '--delete', '--partial',
|
||||
'%s/' % backup_dir,
|
||||
'%s/' % dirs['abs_objdir']],
|
||||
error_list=SSHErrorList)
|
||||
|
||||
def upload_multi(self):
|
||||
# TODO
|
||||
self.info("Not written yet.")
|
||||
|
||||
def _process_command(self, **kwargs):
|
||||
"""Stub wrapper function that allows us to call scratchbox in
|
||||
MaemoMultiLocaleBuild.
|
||||
|
|
|
|||
|
|
@ -23,9 +23,7 @@ class MarMixin(object):
|
|||
dst_dir = self._mar_tool_dir()
|
||||
self.mkdir_p(dst_dir)
|
||||
config = self.config
|
||||
replace_dict = {'platform': config['platform'],
|
||||
'branch': config['branch']}
|
||||
url = config['mar_tools_url'] % replace_dict
|
||||
url = config['mar_tools_url']
|
||||
binaries = (config['mar'], config['mbsdiff'])
|
||||
for binary in binaries:
|
||||
from_url = "/".join((url, binary))
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ import sys
|
|||
import shlex
|
||||
|
||||
# load modules from parent dir
|
||||
sys.path.insert(1, os.path.dirname(sys.path[0]))
|
||||
sys.path.insert(1, os.path.dirname(sys.path[0])) # noqa
|
||||
|
||||
from mozharness.base.errors import MakefileErrorList
|
||||
from mozharness.base.script import BaseScript
|
||||
|
|
@ -45,18 +45,13 @@ FAILURE_STR = "Failed"
|
|||
|
||||
# mandatory configuration options, without them, this script will not work
|
||||
# it's a list of values that are already known before starting a build
|
||||
configuration_tokens = ('branch',
|
||||
'platform',
|
||||
'update_channel',
|
||||
)
|
||||
configuration_tokens = ('branch', 'update_channel')
|
||||
|
||||
# some other values such as "%(version)s", ...
|
||||
# are defined at run time and they cannot be enforced in the _pre_config_lock
|
||||
# phase
|
||||
runtime_config_tokens = ('version', 'locale', 'from_buildid',
|
||||
'abs_objdir', 'revision',
|
||||
'to_buildid', 'en_us_binary_url',
|
||||
'en_us_installer_binary_url', 'mar_tools_url',
|
||||
'who')
|
||||
runtime_config_tokens = ('version', 'locale', 'abs_objdir', 'revision',
|
||||
'en_us_installer_binary_url')
|
||||
|
||||
|
||||
# DesktopSingleLocale {{{1
|
||||
|
|
@ -70,12 +65,6 @@ class DesktopSingleLocale(LocalesMixin, AutomationMixin,
|
|||
"type": "string",
|
||||
"help": "Specify the locale(s) to sign and update. Optionally pass"
|
||||
" revision separated by colon, en-GB:default."}
|
||||
], [
|
||||
['--locales-file', ],
|
||||
{"action": "store",
|
||||
"dest": "locales_file",
|
||||
"type": "string",
|
||||
"help": "Specify a file to determine which locales to sign and update"}
|
||||
], [
|
||||
['--tag-override', ],
|
||||
{"action": "store",
|
||||
|
|
@ -114,17 +103,12 @@ class DesktopSingleLocale(LocalesMixin, AutomationMixin,
|
|||
"list-locales",
|
||||
"setup",
|
||||
"repack",
|
||||
"funsize-props",
|
||||
"summary",
|
||||
],
|
||||
'config': {
|
||||
"ignore_locales": ["en-US"],
|
||||
"locales_dir": "browser/locales",
|
||||
"buildid_section": "App",
|
||||
"buildid_option": "BuildID",
|
||||
"application_ini": "application.ini",
|
||||
"log_name": "single_locale",
|
||||
"hashType": "sha512",
|
||||
},
|
||||
}
|
||||
|
||||
|
|
@ -263,9 +247,6 @@ class DesktopSingleLocale(LocalesMixin, AutomationMixin,
|
|||
config = self.config
|
||||
replace_dict = self.query_abs_dirs()
|
||||
|
||||
replace_dict['en_us_binary_url'] = config.get('en_us_binary_url')
|
||||
# Override en_us_binary_url if packageUrl is passed as a property from
|
||||
# the en-US build
|
||||
bootstrap_env = self.query_env(partial_env=config.get("bootstrap_env"),
|
||||
replace_dict=replace_dict)
|
||||
for binary in self._mar_binaries():
|
||||
|
|
@ -640,12 +621,6 @@ class DesktopSingleLocale(LocalesMixin, AutomationMixin,
|
|||
config = self.config
|
||||
return (config['mar'], config['mbsdiff'])
|
||||
|
||||
def _mar_dir(self, dirname):
|
||||
"""returns the full path of dirname;
|
||||
dirname is an entry in configuration"""
|
||||
dirs = self.query_abs_dirs()
|
||||
return os.path.join(dirs['abs_objdir'], self.config[dirname])
|
||||
|
||||
# TODO: replace with ToolToolMixin
|
||||
def _get_tooltool_auth_file(self):
|
||||
# set the default authentication file based on platform; this
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ except ImportError:
|
|||
import json
|
||||
|
||||
# load modules from parent dir
|
||||
sys.path.insert(1, os.path.dirname(sys.path[0]))
|
||||
sys.path.insert(1, os.path.dirname(sys.path[0])) # noqa
|
||||
|
||||
from mozharness.base.errors import MakefileErrorList
|
||||
from mozharness.base.log import OutputParser
|
||||
|
|
@ -43,13 +43,6 @@ class MobileSingleLocale(LocalesMixin, TooltoolMixin, AutomationMixin,
|
|||
"type": "string",
|
||||
"help": "Specify the locale(s) to sign and update"
|
||||
}
|
||||
], [
|
||||
['--locales-file', ],
|
||||
{"action": "store",
|
||||
"dest": "locales_file",
|
||||
"type": "string",
|
||||
"help": "Specify a file to determine which locales to sign and update"
|
||||
}
|
||||
], [
|
||||
['--tag-override', ],
|
||||
{"action": "store",
|
||||
|
|
|
|||
|
|
@ -1,7 +1,3 @@
|
|||
[clearkey-mp4-playback-temporary-encrypted-clear.https.html]
|
||||
disabled:
|
||||
if os == "linux": https://bugzilla.mozilla.org/show_bug.cgi?id=1301418
|
||||
[org.w3.clearkey, temporary, mp4, playback, single key, encrypted then clear content]
|
||||
expected:
|
||||
if (os == "win") and (version == "5.1.2600"): FAIL
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,6 @@
|
|||
[clearkey-mp4-playback-temporary-events.https.html]
|
||||
disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1312914
|
||||
[org.w3.clearkey, sucessful playback and events, temporary, mp4, set src before setMediaKeys]
|
||||
expected:
|
||||
if (os == "win") and (version == "5.1.2600"): TIMEOUT
|
||||
|
||||
[org.w3.clearkey, temporary, mp4, playback, check events]
|
||||
expected:
|
||||
if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
|
||||
if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
|
||||
if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
|
||||
if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
|
||||
if debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
|
||||
if not debug and e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
|
||||
if debug and not e10s and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
|
||||
|
||||
|
|
|
|||
|
|
@ -1,95 +1,3 @@
|
|||
[clearkey-mp4-requestmediakeysystemaccess.https.html]
|
||||
[Basic supported configuration]
|
||||
expected:
|
||||
if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
|
||||
[Partially supported configuration]
|
||||
expected:
|
||||
if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
|
||||
[Supported audio codec]
|
||||
expected:
|
||||
if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
|
||||
[ContentType formatting must be preserved]
|
||||
expected:
|
||||
if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
|
||||
[Leading space in contentType]
|
||||
expected:
|
||||
if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
|
||||
[Space before ; in contentType]
|
||||
expected:
|
||||
if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
|
||||
[Trailing space in contentType]
|
||||
expected:
|
||||
if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
|
||||
[Space at start of codecs parameter]
|
||||
expected:
|
||||
if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
|
||||
[Space at end of codecs parameter]
|
||||
expected:
|
||||
if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
|
||||
[Video/]
|
||||
expected:
|
||||
if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
|
||||
[Codecs=]
|
||||
expected:
|
||||
if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
|
||||
[Upper case MIME type]
|
||||
expected:
|
||||
if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
|
||||
[CODECS=]
|
||||
expected:
|
||||
if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
|
||||
[org.w3.clearkey, requestMediaKeySystemAccess: Empty configuration should result in NotSupportedError]
|
||||
expected: FAIL
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
[allowed.https.html]
|
||||
[opt_in_method: http-csp\n origin: same-host-https\n source_scheme: https\n context_nesting: top-level\n redirection: keep-scheme-redirect\n subresource: video-tag\n expectation: allowed]
|
||||
expected:
|
||||
if (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
bug: The video this test is using doesn't seem to want to play on WinXP.
|
||||
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
[allowed.https.html]
|
||||
[opt_in_method: http-csp\n origin: same-host-https\n source_scheme: https\n context_nesting: top-level\n redirection: no-redirect\n subresource: video-tag\n expectation: allowed]
|
||||
expected:
|
||||
if (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
bug: The video this test is using doesn't seem to want to play on WinXP.
|
||||
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
[allowed.https.html]
|
||||
[opt_in_method: meta-csp\n origin: same-host-https\n source_scheme: https\n context_nesting: top-level\n redirection: no-redirect\n subresource: video-tag\n expectation: allowed]
|
||||
expected:
|
||||
if (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
bug: The video this test is using doesn't seem to want to play on WinXP.
|
||||
|
||||
|
|
@ -1,7 +1,2 @@
|
|||
[no-opt-in-allows.https.html]
|
||||
prefs: [security.mixed_content.upgrade_display_content:false]
|
||||
[opt_in_method: no-opt-in\n origin: cross-origin-http\n source_scheme: https\n context_nesting: top-level\n redirection: no-redirect\n subresource: video-tag\n expectation: allowed]
|
||||
expected:
|
||||
if (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
bug: The video this test is using doesn't seem to want to play on WinXP.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,2 @@
|
|||
[no-opt-in-allows.https.html]
|
||||
prefs: [security.mixed_content.upgrade_display_content:false]
|
||||
[opt_in_method: no-opt-in\n origin: cross-origin-http\n source_scheme: https\n context_nesting: top-level\n redirection: swap-scheme-redirect\n subresource: video-tag\n expectation: allowed]
|
||||
expected:
|
||||
if (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
bug: The video this test is using doesn't seem to want to play on WinXP.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,2 @@
|
|||
[no-opt-in-allows.https.html]
|
||||
prefs: [security.mixed_content.upgrade_display_content:false]
|
||||
[opt_in_method: no-opt-in\n origin: same-host-http\n source_scheme: https\n context_nesting: top-level\n redirection: keep-scheme-redirect\n subresource: video-tag\n expectation: allowed]
|
||||
expected:
|
||||
if (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
bug: The video this test is using doesn't seem to want to play on WinXP.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,2 @@
|
|||
[no-opt-in-allows.https.html]
|
||||
prefs: [security.mixed_content.upgrade_display_content:false]
|
||||
[opt_in_method: no-opt-in\n origin: same-host-http\n source_scheme: https\n context_nesting: top-level\n redirection: no-redirect\n subresource: video-tag\n expectation: allowed]
|
||||
expected:
|
||||
if (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
bug: The video this test is using doesn't seem to want to play on WinXP.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,2 @@
|
|||
[no-opt-in-allows.https.html]
|
||||
prefs: [security.mixed_content.upgrade_display_content:false]
|
||||
[opt_in_method: no-opt-in\n origin: same-host-http\n source_scheme: https\n context_nesting: top-level\n redirection: swap-scheme-redirect\n subresource: video-tag\n expectation: allowed]
|
||||
expected:
|
||||
if (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
bug: The video this test is using doesn't seem to want to play on WinXP.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
[allowed.https.html]
|
||||
[opt_in_method: no-opt-in\n origin: same-host-https\n source_scheme: https\n context_nesting: top-level\n redirection: keep-scheme-redirect\n subresource: video-tag\n expectation: allowed]
|
||||
expected:
|
||||
if (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
bug: The video this test is using doesn't seem to want to play on WinXP.
|
||||
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
[allowed.https.html]
|
||||
[opt_in_method: no-opt-in\n origin: same-host-https\n source_scheme: https\n context_nesting: top-level\n redirection: no-redirect\n subresource: video-tag\n expectation: allowed]
|
||||
expected:
|
||||
if (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
|
||||
bug: The video this test is using doesn't seem to want to play on WinXP.
|
||||
|
||||
|
|
@ -26,6 +26,7 @@
|
|||
#include "ScreenHelperWin.h"
|
||||
#include "HeadlessScreenHelper.h"
|
||||
#include "mozilla/widget/ScreenManager.h"
|
||||
#include "mozilla/Atomics.h"
|
||||
|
||||
#if defined(ACCESSIBILITY)
|
||||
#include "mozilla/a11y/Compatibility.h"
|
||||
|
|
@ -185,13 +186,23 @@ using mozilla::crashreporter::LSPAnnotate;
|
|||
|
||||
//-------------------------------------------------------------------------
|
||||
|
||||
// Note that since we're on x86-ish processors here, ReleaseAcquire is the
|
||||
// semantics that normal loads and stores would use anyway.
|
||||
static Atomic<size_t, ReleaseAcquire> sOutstandingNativeEventCallbacks;
|
||||
|
||||
/*static*/ LRESULT CALLBACK
|
||||
nsAppShell::EventWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
if (uMsg == sAppShellGeckoMsgId) {
|
||||
// The app shell might have been destroyed between this message being
|
||||
// posted and being executed, so be extra careful.
|
||||
if (!sOutstandingNativeEventCallbacks) {
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
nsAppShell *as = reinterpret_cast<nsAppShell *>(lParam);
|
||||
as->NativeEventCallback();
|
||||
NS_RELEASE(as);
|
||||
--sOutstandingNativeEventCallbacks;
|
||||
return TRUE;
|
||||
}
|
||||
return DefWindowProc(hwnd, uMsg, wParam, lParam);
|
||||
|
|
@ -205,6 +216,9 @@ nsAppShell::~nsAppShell()
|
|||
// the UI thread.
|
||||
SendMessage(mEventWnd, WM_CLOSE, 0, 0);
|
||||
}
|
||||
|
||||
// Cancel any outstanding native event callbacks.
|
||||
sOutstandingNativeEventCallbacks = 0;
|
||||
}
|
||||
|
||||
#if defined(ACCESSIBILITY)
|
||||
|
|
@ -463,7 +477,7 @@ nsAppShell::ScheduleNativeEventCallback()
|
|||
"We should have created mEventWnd in Init, if this is called.");
|
||||
|
||||
// Post a message to the hidden message window
|
||||
NS_ADDREF_THIS(); // will be released when the event is processed
|
||||
++sOutstandingNativeEventCallbacks;
|
||||
{
|
||||
MutexAutoLock lock(mLastNativeEventScheduledMutex);
|
||||
// Time stamp this event so we can detect cases where the event gets
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче