Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-12 10:24:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Install rust-docs rustup component in ./mach doc

Browse source
This commit is contained in:
Simon Sapin 2020-01-02 15:38:32 +01:00
parent 1110cac184
commit f93c03cda3
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
python/servo/command_base.py
View file

@ -994,7 +994,7 @@ install them, let us know by filing a bug!")
return True
return False
def ensure_bootstrapped(self, target=None):
def ensure_bootstrapped(self, target=None, rustup_components=None):
if self.context.bootstrapped:
return
@ -1011,10 +1011,12 @@ install them, let us know by filing a bug!")
if toolchain not in check_output(["rustup", "toolchain", "list"]):
check_call(["rustup", "toolchain", "install", "--profile", "minimal", toolchain])
if "rustc-dev" not in check_output(
installed = check_output(
["rustup", "component", "list", "--installed", "--toolchain", toolchain]
):
check_call(["rustup", "component", "add", "--toolchain", toolchain, "rustc-dev"])
)
for component in set(rustup_components or []) | {"rustc-dev"}:
if component not in installed:
check_call(["rustup", "component", "add", "--toolchain", toolchain, component])
if target and "uwp" not in target and target not in check_output(
["rustup", "target", "list", "--installed", "--toolchain", toolchain]

2
python/servo/post_build_commands.py
View file

@ -241,7 +241,7 @@ class PostBuildCommands(CommandBase):
@CommandBase.build_like_command_arguments
def doc(self, params, features, target=None, android=False, magicleap=False,
media_stack=None, **kwargs):
self.ensure_bootstrapped()
self.ensure_bootstrapped(rustup_components=["rust-docs"])
rustc_path = check_output(
["rustup" + BIN_SUFFIX, "which", "--toolchain", self.rust_toolchain(), "rustc"])
assert path.basename(path.dirname(rustc_path)) == "bin"