Add --dev option to mach build

Require either --dev or --release, unless a default build.mode is set
in .servobuild.  Fixes #5933.

2 files changed, 15 insertions, 1 deletions

diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index 5d5da3298fe..b4b75b64c66 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -106,6 +106,20 @@ class MachCommands(CommandBase):
         opts = params or []
         features = []
 
+        if not (release or dev):
+            if self.config["build"]["mode"] == "dev":
+                dev = True
+            elif self.config["build"]["mode"] == "release":
+                release = True 
+            else:
+                print("Please specify either --dev (-d) for a development")
+                print("  build, or --release (-r) for an optimized build.")
+                sys.exit(1)
+
+        if release and dev:
+            print("Please specify either --dev or --release.")
+            sys.exit(1)
+
         if release:
             opts += ["--release"]
         if target:
diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index 8047bf44179..a46fd21dfc1 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -93,7 +93,7 @@ class CommandBase(object):
 
         self.config.setdefault("build", {})
         self.config["build"].setdefault("android", False)
-
+        self.config["build"].setdefault("mode", "")
         self.config["build"].setdefault("debug-mozjs", False)
 
         self.config.setdefault("android", {})