mirror of
https://github.com/servo/servo.git
synced 2025-06-08 00:23:30 +00:00
Stylo: replace product={gecko,servo} with engine={gecko,servo-2013,servo-2020}
Renaming the variable helped make sure I looked at every use.
This commit is contained in:
parent
f1300bb98b
commit
ddb4e369dd
52 changed files with 870 additions and 469 deletions
|
@ -237,7 +237,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 +265,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
|
||||
|
||||
|
@ -274,7 +275,11 @@ class PostBuildCommands(CommandBase):
|
|||
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"])
|
||||
if "layout-2020" in features:
|
||||
engine = "servo-2020"
|
||||
if "layout-2013" in features:
|
||||
engine = "servo-2013"
|
||||
subprocess.check_call([sys.executable, build, engine, "html"])
|
||||
|
||||
script = path.join(self.context.topdir, "components", "script")
|
||||
subprocess.check_call(["cmake", "."], cwd=script)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue