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

Rename rust-snapshot-hash to rust-nightly-date

Browse source 
… and remove mentions of "snapshots".

We now use rust-lang.org nightly builds rather than our own snapshots.
This commit is contained in:
Simon Sapin 2015-12-30 12:12:20 +00:00
parent 856eea3a0e
commit b2af8567fa
5 changed files with 36 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

17
python/servo/command_base.py
View file

@ -97,7 +97,7 @@ class CommandBase(object):
self.config["tools"].setdefault("cargo-root", "")
if not self.config["tools"]["system-rust"]:
self.config["tools"]["rust-root"] = path.join(
context.sharedir, "rust", self.rust_snapshot_path())
context.sharedir, "rust", self.rust_path())
if not self.config["tools"]["system-cargo"]:
self.config["tools"]["cargo-root"] = path.join(
context.sharedir, "cargo", self.cargo_build_id())
@ -119,17 +119,16 @@ class CommandBase(object):
self.config["gonk"].setdefault("b2g", "")
self.config["gonk"].setdefault("product", "flame")
_rust_snapshot_path = None
_rust_path = None
_cargo_build_id = None
def rust_snapshot_path(self):
if self._rust_snapshot_path is None:
filename = path.join(self.context.topdir, "rust-snapshot-hash")
def rust_path(self):
if self._rust_path is None:
filename = path.join(self.context.topdir, "rust-nightly-date")
with open(filename) as f:
snapshot_hash = f.read().strip()
self._rust_snapshot_path = ("%s/rustc-nightly-%s" %
(snapshot_hash, host_triple()))
return self._rust_snapshot_path
date = f.read().strip()
self._rust_path = ("%s/rustc-nightly-%s" % (date, host_triple()))
return self._rust_path
def cargo_build_id(self):
if self._cargo_build_id is None: