corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1390693 - Use separate variable for the base output directory; r=dustin

Browse Source 
An upcoming commit will want to put something outside the
format-specific output directory.

MozReview-Commit-ID: 2kYDREddpN
This commit is contained in:
Gregory Szorc
2017-08-24 10:31:41 -07:00
parent 9ce5d46cfd
commit 473e00f97d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/docs/mach_commands.py
View File

@@ -47,7 +47,8 @@ class Documentation(MachCommandBase):
outdir = os.path.join(self.topobjdir, 'docs')
if not what:
what = [os.path.join(self.topsrcdir, 'tools')]
outdir = os.path.join(outdir, format)
format_outdir = os.path.join(outdir, format)
generated = []
failed = []
@@ -61,7 +62,7 @@ class Documentation(MachCommandBase):
# find project name to use as a namespace within `outdir`
project = self._find_project_name(docdir)
savedir = os.path.join(outdir, project)
savedir = os.path.join(format_outdir, project)
args = [
'sphinx',
@@ -92,7 +93,8 @@ class Documentation(MachCommandBase):
if len(addr) != 2:
return die('invalid address: %s' % http)
httpd = mozhttpd.MozHttpd(host=addr[0], port=addr[1], docroot=outdir)
httpd = mozhttpd.MozHttpd(host=addr[0], port=addr[1],
docroot=format_outdir)
print('listening on %s:%d' % addr)
httpd.start(block=True)