servo: Merge #3930 - Issue #3804 : Allow enabling debug-mozjs from servobuild config (from fabricedesre:issue3804); r=jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: 23b75816a2fafe9004c2def038f0c0fe774cc1a8

servo/python/servo/build_commands.py

@@ -56,7 +56,7 @@ class MachCommands(CommandBase):
             opts += ["-v"]
 
         features = []
-        if debug_mozjs:
+        if debug_mozjs or self.config["build"]["debug-mozjs"]:
             features += ["script/debugmozjs"]
 
         if features:

servo/python/servo/command_base.py

@@ -79,6 +79,8 @@ class CommandBase(object):
         self.config.setdefault("build", {})
         self.config["build"].setdefault("android", False)
 
+        self.config["build"].setdefault("debug-mozjs", False)
+
         self.config.setdefault("android", {})
         self.config["android"].setdefault("sdk", "")
         self.config["android"].setdefault("ndk", "")

servo/servobuild.example

@@ -12,6 +12,8 @@ cargo-root = "/path/to/cargo"
 [build]
 # Set "android = true" or use `mach build --android` to build the Android app.
 android = false
+# Set "debug-mozjs" or use `mach build --debug-mozjs` to build a debug spidermonkey.
+debug-mozjs = false
 
 # Android information
 [android]