Fix: make-mode will work with sphinx-build command that is generated from setup.py entry_points definition.

This fix relates to https://bitbucket.org/birkenfeld/sphinx/pull-request/203/add-make-mode-to-sphinx-build-invoked-by/diff#comment-1133945
This commit is contained in:
Takayuki Shimizukawa 2014-05-25 02:06:39 +09:00
parent 82a53382d5
commit edb8fd96bd
2 changed files with 9 additions and 5 deletions

View File

@ -11,8 +11,5 @@
import sys
if __name__ == '__main__':
from sphinx import main, make_main
if sys.argv[1:2] == ['-M']:
sys.exit(make_main(sys.argv))
else:
sys.exit(main(sys.argv))
from sphinx import main
sys.exit(main(sys.argv))

View File

@ -41,6 +41,13 @@ if '+' in __version__ or 'pre' in __version__:
def main(argv=sys.argv):
if sys.argv[1:2] == ['-M']:
sys.exit(make_main(argv))
else:
sys.exit(build_main(argv))
def build_main(argv=sys.argv):
"""Sphinx build "main" command-line entry."""
if sys.version_info[:3] < (2, 5, 0):
sys.stderr.write('Error: Sphinx requires at least Python 2.5 to run.\n')