servo: Merge #14254 - Run cargo doc on libservo crate (from mbrubeck:mach-doc-fix); r=metajack
authorMatt Brubeck <mbrubeck@limpet.net>
Thu, 17 Nov 2016 00:02:45 -0600
changeset 340165 637897853905780bcf5563bf7b74b8fe3d45ab4a
parent 340164 c540bc5a85a119d84a5fc22b318135d7ea283e6c
child 340166 5eb149d670f67236e015203e69ab94c01b7cec09
push id31307
push usergszorc@mozilla.com
push dateSat, 04 Feb 2017 00:59:06 +0000
treeherdermozilla-central@94079d43835f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmetajack
servo: Merge #14254 - Run cargo doc on libservo crate (from mbrubeck:mach-doc-fix); r=metajack Fixes `./mach doc` regression caused by #14172. Source-Repo: https://github.com/servo/servo Source-Revision: efae67ed18d11d599616f1515fe2ce3885491457
servo/python/servo/post_build_commands.py
--- a/servo/python/servo/post_build_commands.py
+++ b/servo/python/servo/post_build_commands.py
@@ -212,17 +212,17 @@ class PostBuildCommands(CommandBase):
                     if path.isdir(full_name):
                         if path.exists(destination):
                             rmtree(destination)
                         copytree(full_name, destination)
                     else:
                         copy2(full_name, destination)
 
         return call(["cargo", "doc"] + params,
-                    env=self.build_env(), cwd=self.servo_crate())
+                    env=self.build_env(), cwd=path.join('components', 'servo'))
 
     @Command('browse-doc',
              description='Generate documentation and open it in a web browser',
              category='post-build')
     def serve_docs(self):
         self.doc([])
         import webbrowser
         webbrowser.open("file://" + path.abspath(path.join(