aboutsummaryrefslogtreecommitdiffstats
path: root/python
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-07-30 02:40:38 -0400
committerGitHub <noreply@github.com>2019-07-30 02:40:38 -0400
commit8e7daa77b62a692beda57debf852d635cf24c49e (patch)
treef7665316c66f19821786f957aa5d274a7d659846 /python
parent73784246b84295e5775d9d2e6d5fc7a21a5bdab8 (diff)
parent0215d09ccbfed85c91605dedbb175dc9a96ba0ab (diff)
downloadservo-8e7daa77b62a692beda57debf852d635cf24c49e.tar.gz
servo-8e7daa77b62a692beda57debf852d635cf24c49e.zip
Auto merge of #23856 - servo:stylo-engines, r=nox
Stylo: replace product={gecko,servo} with engine={gecko,servo-2013,servo-2020} Renaming the variable helped make sure I looked at every use. Also auto-generate relevant parts of `CSSStyleDeclaration.webidl`, to make libscript compile accordingly. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23856) <!-- Reviewable:end -->
Diffstat (limited to 'python')
-rw-r--r--python/servo/post_build_commands.py14
1 files changed, 3 insertions, 11 deletions
diff --git a/python/servo/post_build_commands.py b/python/servo/post_build_commands.py
index b9dc9b080ef..1855fefff25 100644
--- a/python/servo/post_build_commands.py
+++ b/python/servo/post_build_commands.py
@@ -13,7 +13,6 @@ import json
import os
import os.path as path
import subprocess
-import sys
from shutil import copytree, rmtree, copy2
from mach.decorators import (
@@ -237,7 +236,7 @@ class PostBuildCommands(CommandBase):
'params', nargs='...',
help="Command-line arguments to be passed through to cargo doc")
@CommandBase.build_like_command_arguments
- def doc(self, params, **kwargs):
+ def doc(self, params, features, **kwargs):
env = os.environ.copy()
env["RUSTUP_TOOLCHAIN"] = self.toolchain()
rustc_path = check_output(["rustup" + BIN_SUFFIX, "which", "rustc"], env=env)
@@ -265,7 +264,8 @@ class PostBuildCommands(CommandBase):
else:
copy2(full_name, destination)
- returncode = self.run_cargo_build_like_command("doc", params, **kwargs)
+ features = features or []
+ returncode = self.run_cargo_build_like_command("doc", params, features=features, **kwargs)
if returncode:
return returncode
@@ -273,14 +273,6 @@ class PostBuildCommands(CommandBase):
for name in os.listdir(static):
copy2(path.join(static, name), path.join(docs, name))
- build = path.join(self.context.topdir, "components", "style", "properties", "build.py")
- subprocess.check_call([sys.executable, build, "servo", "html"])
-
- script = path.join(self.context.topdir, "components", "script")
- subprocess.check_call(["cmake", "."], cwd=script)
- subprocess.check_call(["cmake", "--build", ".", "--target", "supported-apis"], cwd=script)
- copy2(path.join(script, "apis.html"), path.join(docs, "servo", "apis.html"))
-
@Command('browse-doc',
description='Generate documentation and open it in a web browser',
category='post-build')