From 865ba9b7593d07fefdcc69d9d6337a86d0935a7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabrice=20Desr=C3=A9?= Date: Fri, 7 Nov 2014 01:24:28 -0700 Subject: [PATCH] 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 | 2 +- servo/python/servo/command_base.py | 2 ++ servo/servobuild.example | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/servo/python/servo/build_commands.py b/servo/python/servo/build_commands.py index 7dd4b3995f55..009c4b76c40c 100644 --- a/servo/python/servo/build_commands.py +++ b/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: diff --git a/servo/python/servo/command_base.py b/servo/python/servo/command_base.py index d78c0e13a1c7..96cf287b3298 100644 --- a/servo/python/servo/command_base.py +++ b/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", "") diff --git a/servo/servobuild.example b/servo/servobuild.example index 2d0ceeba46f9..db3aba17f4f0 100644 --- a/servo/servobuild.example +++ b/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]