Bug 1299276 - Add a separate --enable-stylo option to control MOZ_STYLO separate from the linkage effects of --with-servo. r=froydnj
authorBobby Holley <bobbyholley@gmail.com>
Tue, 30 Aug 2016 13:10:00 -0700
changeset 312039 4b36234946e31cdeea12099ce12e6fd697601e5e
parent 312038 cfcfff96e4ffd245631e59cacb187410ef20362c
child 312040 60063982b91c3adf6570312546c489b749ea48be
push id31884
push userryanvm@gmail.com
push dateWed, 31 Aug 2016 13:55:25 +0000
treeherderautoland@a393b23f1822 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1299276
milestone51.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 1299276 - Add a separate --enable-stylo option to control MOZ_STYLO separate from the linkage effects of --with-servo. r=froydnj
CLOBBER
toolkit/moz.configure
--- a/CLOBBER
+++ b/CLOBBER
@@ -17,9 +17,9 @@
 #
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
 # Are you updating CLOBBER because you think it's needed for your WebIDL
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Bug 1299276 - This needed a CLOBBER, apparently
+Bug 1299332 for the relanding of Bug 1299276.
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -492,29 +492,37 @@ simple_keyfile('Mozilla API')
 simple_keyfile('Google API')
 
 id_and_secret_keyfile('Bing API')
 
 simple_keyfile('Adjust SDK')
 
 # Servo integration
 # ==============================================================
+option('--enable-stylo', env='STYLO_ENABLED', nargs=0,
+       help='Enables experimental integration with the servo style system. '
+            'This requires either building servo within Gecko\'s cargo phase '
+            'or passing --with-servo')
+
+@depends('--enable-stylo')
+def stylo(value):
+    if value:
+        return True
+
+set_define('MOZ_STYLO', stylo)
+imply_option('--enable-jemalloc', depends_if('--enable-stylo')(lambda _: 'moz'))
+
 option('--with-servo', env='SERVO_TARGET_DIR', nargs=1,
        help='Absolute path of the target directory where libgeckoservo can '
-            'be found. This is generally servo_src_dir/target/release.'
-            'Passing this flag enables experimental integration with the '
-            'servo style system')
+            'be found. This is generally servo_src_dir/target/release.')
 
 @depends_if('--with-servo')
 def servo_target_dir(value):
     return value[0]
 
-imply_option('--enable-jemalloc', depends_if('--with-servo')(lambda _: 'moz'))
-
-set_define('MOZ_STYLO', depends_if(servo_target_dir)(lambda x: bool(x)))
 set_config('SERVO_TARGET_DIR', servo_target_dir)
 
 # Gecko integrated IPC fuzzer
 # ==============================================================
 option('--enable-ipc-fuzzer', env='MOZ_FAULTY',
        help='Enable IPC fuzzer')
 
 @depends('--enable-ipc-fuzzer', target)