Bug 1447301: Disable the old style system by default. r=froydnj
authorEmilio Cobos Álvarez <emilio@crisal.io>
Tue, 20 Mar 2018 15:25:10 +0100
changeset 409061 4887ddbdaafacd212fa98a31c912ed9b1ed017e4
parent 409060 73439b2acd646aeb80d3273a6bde9bf1ea00c472
child 409062 d5e8434efa2d0564fe1ca506c01eb32a6c8e271e
push id33672
push usercsabou@mozilla.com
push dateTue, 20 Mar 2018 22:24:55 +0000
treeherdermozilla-central@6d0f84afc194 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1447301
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1447301: Disable the old style system by default. r=froydnj 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
browser/config/mozconfigs/linux64/stylo-only
browser/config/mozconfigs/linux64/stylo-only-debug
taskcluster/ci/build/linux.yml
toolkit/moz.configure
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,37 @@ 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.')
+            'runtime.')
 
 @depends('--enable-stylo', '--help')
 def stylo_config(value, _):
-    build_stylo = None
-    enable_stylo = None
-    old_style = True
+    # If nothing is specified, default to building and enabling Stylo,
+    # and not building the old style system.
+    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 stylo entirely.
+        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',