diff options
Diffstat (limited to 'sphinx/make_mode.py')
| -rw-r--r-- | sphinx/make_mode.py | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/sphinx/make_mode.py b/sphinx/make_mode.py index 346f9db2d..4f55d71aa 100644 --- a/sphinx/make_mode.py +++ b/sphinx/make_mode.py @@ -19,9 +19,9 @@ from __future__ import print_function import os import sys from os import path -from subprocess import call import sphinx +from sphinx import cmdline from sphinx.util.console import bold, blue # type: ignore from sphinx.util.osutil import cd, rmtree @@ -277,20 +277,12 @@ class Make(object): if doctreedir is None: doctreedir = self.builddir_join('doctrees') - orig_cmd = sys.argv[0] - if sys.platform == 'win32' and orig_cmd.endswith('.exe'): - # win32: 'sphinx-build.exe' - cmd = [orig_cmd] - elif sys.platform == 'win32' and os.path.splitext(orig_cmd)[1] == '': - # win32: 'sphinx-build' without extension - cmd = [orig_cmd + '.exe'] - else: - # win32: 'sphinx-build.py' - # linux, mac: 'sphinx-build' or 'sphinx-build.py' - cmd = [sys.executable, orig_cmd] - - return call(cmd + ['-b', builder] + opts + # type: ignore - ['-d', doctreedir, self.srcdir, self.builddir_join(builder)]) # type: ignore # NOQA + args = [sys.argv[0], + '-b', builder, + '-d', doctreedir, + self.srcdir, + self.builddir_join(builder)] + return cmdline.main(args + opts) def run_make_mode(args): |