Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-21 15:49:04 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

9
README.md
View file

@ -74,15 +74,18 @@ Mach tools to orchestrate the build and other tasks.
### Normal build ### Normal build
To build Servo in development mode. This is useful for development, but
the resulting binary is very slow.
``` sh ``` sh
git clone https://github.com/servo/servo git clone https://github.com/servo/servo
cd servo cd servo
./mach build ./mach build --dev
./mach run tests/html/about-mozilla.html ./mach run tests/html/about-mozilla.html
``` ```
By default, Servo builds in debug mode. This is useful for development, but For benchmarking, performance testing, or
the resulting binary is very slow. For benchmarking, performance testing, or
real-world use, add the `--release` flag to create an optimized build: real-world use, add the `--release` flag to create an optimized build:
``` sh ``` sh

14
python/servo/build_commands.py
View file

@ -137,6 +137,20 @@ class MachCommands(CommandBase):
opts = params or [] opts = params or []
features = [] 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: if release:
opts += ["--release"] opts += ["--release"]
if target: if target:

2
python/servo/command_base.py
View file

@ -93,7 +93,7 @@ class CommandBase(object):
self.config.setdefault("build", {}) self.config.setdefault("build", {})
self.config["build"].setdefault("android", False) self.config["build"].setdefault("android", False)
self.config["build"].setdefault("mode", "")
self.config["build"].setdefault("debug-mozjs", False) self.config["build"].setdefault("debug-mozjs", False)
self.config.setdefault("android", {}) self.config.setdefault("android", {})

3
servobuild.example
View file

@ -23,6 +23,9 @@ system-cargo = false
cargo-root = "/path/to/cargo" cargo-root = "/path/to/cargo"
[build] [build]
# Set "mode = dev" or use `mach build --dev` to build the project with warning.
# or Set "mode = release" or use `mach build --release` for optimized build.
mode = "dev"
# Set "android = true" or use `mach build --android` to build the Android app. # Set "android = true" or use `mach build --android` to build the Android app.
android = false android = false
# Set "debug-mozjs" or use `mach build --debug-mozjs` to build a debug spidermonkey. # Set "debug-mozjs" or use `mach build --debug-mozjs` to build a debug spidermonkey.