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 -->
This commit is contained in:
bors-servo 2015-05-14 11:26:18 -05:00
commit c0d8488b71
4 changed files with 24 additions and 4 deletions

View file

@ -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: