Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move snapshot dir inside the source dir by default

Browse source 
This avoids changing any directories outside the repo, which is better for
some automation scenarios.

The servobuild.example file has a "cache-dir" setting that restores the
previous default location of `~/.servo`, which is useful for developers
working with multiple clones on the same machine.
This commit is contained in:
Matt Brubeck 2015-01-28 10:33:04 -08:00
parent 0f81e70882
commit 53135b2566
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
python/servo/command_base.py
View file

@ -54,9 +54,6 @@ class CommandBase(object):
if not hasattr(self.context, "bootstrapped"): if not hasattr(self.context, "bootstrapped"):
self.context.bootstrapped = False self.context.bootstrapped = False
if not hasattr(self.context, "sharedir"):
self.context.sharedir = path.join(path.expanduser("~/"), ".servo")
config_path = path.join(context.topdir, ".servobuild") config_path = path.join(context.topdir, ".servobuild")
if path.exists(config_path): if path.exists(config_path):
self.config = toml.loads(open(config_path).read()) self.config = toml.loads(open(config_path).read())
@ -65,6 +62,11 @@ class CommandBase(object):
# Handle missing/default items # Handle missing/default items
self.config.setdefault("tools", {}) self.config.setdefault("tools", {})
self.config["tools"].setdefault("cache-dir",
path.join(context.topdir, ".servo"))
# Allow "~" in cache-dir
context.sharedir = path.expanduser(self.config["tools"]["cache-dir"])
self.config["tools"].setdefault("system-rust", False) self.config["tools"].setdefault("system-rust", False)
self.config["tools"].setdefault("system-cargo", False) self.config["tools"].setdefault("system-cargo", False)
self.config["tools"].setdefault("rust-root", "") self.config["tools"].setdefault("rust-root", "")

3
servobuild.example
View file

@ -1,5 +1,8 @@
# Tool options # Tool options
[tools] [tools]
# Where Rust compiler snapshots and other downloads will be stored. Can be
# shared by multiple Servo reposities. Defaults to <servo-repo>/.servo
cache-dir = "~/.servo"
# If system-rust is true, will use rustc/rustdoc from the path, or if # If system-rust is true, will use rustc/rustdoc from the path, or if
# rust-root is specified, will make sure that rust-root is in the path # rust-root is specified, will make sure that rust-root is in the path
# when building. Similarly for Cargo. This takes care of PATH as well as # when building. Similarly for Cargo. This takes care of PATH as well as