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

Fixes #3353: rust snapshot downloads to home directory

Browse source
This commit is contained in:
Anthony Miyaguchi 2014-09-17 01:55:53 -07:00 • committed by Matt Brubeck
parent b27ec2b223
commit 75b340a243
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
python/servo/bootstrap_commands.py
View file

@ -67,7 +67,7 @@ class MachCommands(CommandBase):
help='Force download even if a snapshot already exists')
def bootstrap_rustc(self, force=False):
rust_dir = path.join(
self.context.topdir, "rust", *self.rust_snapshot_path().split("/"))
self.context.sharedir, "rust", *self.rust_snapshot_path().split("/"))
if not force and path.exists(path.join(rust_dir, "bin", "rustc")):
print("Snapshot Rust compiler already downloaded.", end=" ")
print("Use |bootstrap_rust --force| to download again.")
@ -96,7 +96,7 @@ class MachCommands(CommandBase):
action='store_true',
help='Force download even if cargo already exists')
def bootstrap_cargo(self, force=False):
cargo_dir = path.join(self.context.topdir, "cargo")
cargo_dir = path.join(self.context.sharedir, "cargo")
if not force and path.exists(path.join(cargo_dir, "bin", "cargo")):
print("Cargo already downloaded.", end=" ")
print("Use |bootstrap_cargo --force| to download again.")

9
python/servo/command_base.py
View file

@ -54,6 +54,9 @@ class CommandBase(object):
if not hasattr(self.context, "bootstrapped"):
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")
if path.exists(config_path):
self.config = toml.loads(open(config_path).read())
@ -68,10 +71,10 @@ class CommandBase(object):
self.config["tools"].setdefault("cargo-root", "")
if not self.config["tools"]["system-rust"]:
self.config["tools"]["rust-root"] = path.join(
context.topdir, "rust", *self.rust_snapshot_path().split("/"))
context.sharedir, "rust", *self.rust_snapshot_path().split("/"))
if not self.config["tools"]["system-cargo"]:
self.config["tools"]["cargo-root"] = path.join(
context.topdir, "cargo")
context.sharedir, "cargo")
self.config.setdefault("build", {})
self.config["build"].setdefault("android", False)
@ -148,7 +151,7 @@ class CommandBase(object):
Registrar.dispatch("bootstrap-rust", context=self.context)
if not self.config["tools"]["system-cargo"] and \
not path.exists(path.join(
self.context.topdir, "cargo", "bin", "cargo")):
self.config["tools"]["cargo-root"], "bin", "cargo")):
Registrar.dispatch("bootstrap-cargo", context=self.context)
self.context.bootstrapped = True