Bug 1447301: Disable the old style system by default. r?Build
This keeps --disable-stylo working and --enable-stylo=build with the same
semantics, but it makes also --enable-stylo / and the default to not build the
old style system at all.
This also removes the stylo-only platforms, since they're now the default.
MozReview-Commit-ID: DL2eZZn9suE
deleted file mode 100644
--- a/browser/config/mozconfigs/linux64/stylo-only
+++ /dev/null
@@ -1,3 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/linux64/nightly"
-
-ac_add_options --enable-stylo=only
deleted file mode 100644
--- a/browser/config/mozconfigs/linux64/stylo-only-debug
+++ /dev/null
@@ -1,3 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/linux64/debug"
-
-ac_add_options --enable-stylo=only
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -802,70 +802,8 @@ linux64-add-on-devel/opt:
tooltool-downloads: public
need-xvfb: true
run-on-projects: ['mozilla-beta', 'mozilla-release', 'mozilla-esr45']
toolchains:
- linux64-clang
- linux64-gcc
- linux64-rust
- linux64-sccache
-
-linux64-stylo-only/opt:
- description: "Linux64 Stylo Only Opt"
- index:
- product: firefox
- job-name: linux64-stylo-only-opt
- treeherder:
- platform: linux64-stylo-only/opt
- symbol: B
- tier: 2
- worker-type: aws-provisioner-v1/gecko-{level}-b-linux
- worker:
- max-run-time: 36000
- run:
- using: mozharness
- actions: [get-secrets build check-test update]
- config:
- - builds/releng_base_firefox.py
- - builds/releng_base_linux_64_builds.py
- script: "mozharness/scripts/fx_desktop_build.py"
- extra-config:
- mozconfig_variant: 'stylo-only'
- secrets: true
- tooltool-downloads: public
- need-xvfb: true
- run-on-projects: ['mozilla-central', 'try', 'mozilla-inbound', 'autoland']
- toolchains:
- - linux64-clang
- - linux64-gcc
- - linux64-rust
- - linux64-sccache
-
-linux64-stylo-only/debug:
- description: "Linux64 Stylo Only Debug"
- index:
- product: firefox
- job-name: linux64-stylo-only-debug
- treeherder:
- platform: linux64-stylo-only/debug
- symbol: B
- tier: 2
- worker-type: aws-provisioner-v1/gecko-{level}-b-linux
- worker:
- max-run-time: 36000
- run:
- using: mozharness
- actions: [get-secrets build check-test update]
- config:
- - builds/releng_base_firefox.py
- - builds/releng_base_linux_64_builds.py
- script: "mozharness/scripts/fx_desktop_build.py"
- extra-config:
- mozconfig_variant: 'stylo-only-debug'
- secrets: true
- tooltool-downloads: public
- need-xvfb: true
- run-on-projects: ['mozilla-central', 'try', 'mozilla-inbound', 'autoland']
- toolchains:
- - linux64-clang
- - linux64-gcc
- - linux64-rust
- - linux64-sccache
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -547,44 +547,38 @@ id_and_secret_keyfile('Bing API')
simple_keyfile('Adjust SDK')
id_and_secret_keyfile('Leanplum SDK')
simple_keyfile('Pocket API')
# Servo integration
# ==============================================================
-option('--enable-stylo', nargs='?', choices=('build', 'only'),
+option('--enable-stylo', nargs='?', choices=('build',),
help='Include Stylo in the build. "build" means to disable Stylo at ' +
'runtime, and "only" means to exclude the old style system from ' +
'the build.')
@depends('--enable-stylo', '--help')
def stylo_config(value, _):
- build_stylo = None
- enable_stylo = None
- old_style = True
+ build_stylo = True
+ enable_stylo = True
+ old_style = None
# If nothing is specified, default to building and enabling Stylo,
# and building the old style system.
- if value.origin == 'default':
- build_stylo = True
- enable_stylo = True
- elif len(value) and value[0] == 'build':
+ if len(value) and value[0] == 'build':
# Build but disable by request.
- build_stylo = True
- elif len(value) and value[0] == 'only':
- # Disable the old style system.
- build_stylo = True
- enable_stylo = True
- old_style = None
- elif bool(value):
- # Build and enable.
- build_stylo = True
- enable_stylo = True
+ enable_stylo = None
+ old_style = True
+ elif value.origin != 'default' and not bool(value):
+ # Disable
+ old_style = True
+ build_stylo = None
+ enable_stylo = None
return namespace(
build = build_stylo,
enable = enable_stylo,
old_style = old_style,
)
option('--disable-stylo-build-bindgen',