diff options
| author | bors-servo <metajack+bors@gmail.com> | 2014-12-02 19:27:51 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2014-12-02 19:27:51 -0700 |
| commit | 873ca6cadddc1a40bead1f5dd0128bb16cfaa11b (patch) | |
| tree | e9a1c8b6dc056448fea6d52229e54817b97d14d2 /python/servo/post_build_commands.py | |
| parent | b2b6d4d0d1e381d038dc5e45cbe74304704934e7 (diff) | |
| parent | e1c2210c23e2e5f7a24901618698c090279092ee (diff) | |
| download | servo-873ca6cadddc1a40bead1f5dd0128bb16cfaa11b.tar.gz servo-873ca6cadddc1a40bead1f5dd0128bb16cfaa11b.zip | |
auto merge of #4140 : SimonSapin/servo/no-root-cargo-toml, r=SimonSapin
This fixes #3957, and allow #4115 not to regress #4099.
Diffstat (limited to 'python/servo/post_build_commands.py')
| -rw-r--r-- | python/servo/post_build_commands.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/python/servo/post_build_commands.py b/python/servo/post_build_commands.py index c2c4bb5c06b..972dea7429b 100644 --- a/python/servo/post_build_commands.py +++ b/python/servo/post_build_commands.py @@ -37,7 +37,7 @@ class MachCommands(CommandBase): env = self.build_env() env["RUST_BACKTRACE"] = "1" - args = [path.join("target", "servo")] + args = [path.join("components", "servo", "target", "servo")] # Borrowed and modified from: # http://hg.mozilla.org/mozilla-central/file/c9cfa9b91dea/python/mozbuild/mozbuild/mach_commands.py#l883 @@ -71,7 +71,7 @@ class MachCommands(CommandBase): def doc(self, params): self.ensure_bootstrapped() return subprocess.call(["cargo", "doc"] + params, - env=self.build_env()) + env=self.build_env(), cwd=self.servo_crate()) @Command('serve-docs', description='Locally serve Servo and Rust documentation', @@ -81,13 +81,13 @@ class MachCommands(CommandBase): help="Port to serve documentation at (default is 8888)") def serve_docs(self, port): self.doc([]) - servedir = path.join("target", "serve-docs") - docdir = path.join("target", "doc") + servedir = path.join("components", "servo", "target", "serve-docs") + docdir = path.join("components", "servo", "target", "doc") rmtree(servedir, True) copytree(docdir, servedir, ignore=ignore_patterns('.*')) - rustdocs = path.join("rust", self.rust_snapshot_path(), "doc") + rustdocs = path.join(self.config["tools"]["rust-root"], "doc") copytree(rustdocs, path.join(servedir, "rust"), ignore=ignore_patterns('.*')) chdir(servedir) |