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

Mach: rename default_toolchain to rust_toolchain

Browse source
This commit is contained in:
Simon Sapin 2020-01-02 13:56:16 +01:00
parent 7281336116
commit cef92a2050
4 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
python/servo/bootstrap_commands.py
View file

@ -281,8 +281,7 @@ class MachCommands(CommandBase):
default='1',
help='Keep up to this many most recent nightlies')
def clean_nightlies(self, force=False, keep=None):
default_toolchain = self.default_toolchain()
print("Current Rust version for Servo: {}".format(default_toolchain))
print("Current Rust version for Servo: {}".format(self.rust_toolchain()))
old_toolchains = []
keep = int(keep)
stdout = subprocess.check_output(['git', 'log', '--format=%H', 'rust-toolchain'])

2
python/servo/build_commands.py
View file

@ -243,7 +243,7 @@ class MachCommands(CommandBase):
self.call_rustup_run(["rustc", "--version"])
check_call(["rustup" + BIN_SUFFIX, "target", "add",
"--toolchain", self.toolchain(), target])
"--toolchain", self.rust_toolchain(), target])
env = self.build_env(target=target, is_build=True, uwp=uwp, features=features)
self.ensure_bootstrapped(target=target)

15
python/servo/command_base.py
View file

@ -345,17 +345,14 @@ class CommandBase(object):
# Set default android target
self.handle_android_target("armv7-linux-androideabi")
_default_toolchain = None
_rust_toolchain = None
def toolchain(self):
return self.default_toolchain()
def default_toolchain(self):
if self._default_toolchain is None:
def rust_toolchain(self):
if self._rust_toolchain is None:
filename = path.join(self.context.topdir, "rust-toolchain")
with open(filename) as f:
self._default_toolchain = f.read().strip()
return self._default_toolchain
self._rust_toolchain = f.read().strip()
return self._rust_toolchain
def call_rustup_run(self, args, **kwargs):
if self.config["tools"]["use-rustup"]:
@ -373,7 +370,7 @@ class CommandBase(object):
print("rustup is at version %s.%s.%s, Servo requires 1.11.0 or more recent." % version)
print("Try running 'rustup self update'.")
return 1
toolchain = self.toolchain()
toolchain = self.rust_toolchain()
if platform.system() == "Windows":
toolchain += "-x86_64-pc-windows-msvc"
args = ["rustup" + BIN_SUFFIX, "run", "--install", toolchain] + args

5
python/servo/post_build_commands.py
View file

@ -241,9 +241,8 @@ class PostBuildCommands(CommandBase):
@CommandBase.build_like_command_arguments
def doc(self, params, features, target=None, android=False, magicleap=False,
media_stack=None, **kwargs):
env = os.environ.copy()
env["RUSTUP_TOOLCHAIN"] = self.toolchain()
rustc_path = check_output(["rustup" + BIN_SUFFIX, "which", "rustc"], env=env)
rustc_path = check_output(
["rustup" + BIN_SUFFIX, "which", "--toolchain", self.rust_toolchain(), "rustc"])
assert path.basename(path.dirname(rustc_path)) == "bin"
toolchain_path = path.dirname(path.dirname(rustc_path))
rust_docs = path.join(toolchain_path, "share", "doc", "rust", "html")