Auto merge of #6038 - mbrubeck:jinankjain-Bug#5933, r=mbrubeck

Require either `--dev` or `--release`, unless a default build.mode is set in `.servobuild`.  This is @jinankjain's patch from #5965, rebased onto master.  It is already reviewed, and only waiting for servo/saltfs#28 to be deployed.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6038)
<!-- Reviewable:end -->

python/servo/build_commands.py

@@ -137,6 +137,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:

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", {})