From d4c127d93cf30ca24dcf5655b72b29c528888442 Mon Sep 17 00:00:00 2001 From: Takayuki Shimizukawa Date: Fri, 19 Dec 2014 01:14:57 +0900 Subject: [PATCH] Fix: make-mode didn't work on Win32 platform if sphinx was installed by wheel package. --- CHANGES | 2 ++ sphinx/make_mode.py | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 6606530d1..071b940fc 100644 --- a/CHANGES +++ b/CHANGES @@ -39,6 +39,8 @@ Bugs fixed * #1607: Fix a crash when building latexpdf with "howto" class * #1251: Fix again. Sections which depth are lower than :tocdepth: should not be shown on localtoc sidebar. +* make-mode didn't work on Win32 platform if sphinx was installed by wheel + package. Release 1.3b1 (released Oct 10, 2014) diff --git a/sphinx/make_mode.py b/sphinx/make_mode.py index d95c848b9..7b5e75aae 100644 --- a/sphinx/make_mode.py +++ b/sphinx/make_mode.py @@ -249,7 +249,16 @@ class Make(object): opts.extend(['-D', 'latex_paper_size=' + papersize]) if doctreedir is None: doctreedir = self.builddir_join('doctrees') - return call([sys.executable, sys.argv[0], '-b', builder] + opts + + + orig_cmd = sys.argv[0] + if orig_cmd.endswith('.exe'): + cmd = [orig_cmd] + elif sys.platform == 'win32': + cmd = [orig_cmd + '.exe'] + else: # ex. 'sphinx-build' or 'sphinx-build.py' + cmd = [sys.executable, orig_cmd] + + return call(cmd + ['-b', builder] + opts + ['-d', doctreedir, self.srcdir, self.builddir_join(builder)])