IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Default SPHINXBUILD to 'python -msphinx' instead of 'sphinx-build'."

Browse Source 
This reverts commit 0832aa73ab.
This commit is contained in:
Takeshi KOMIYA 2017-10-21 16:22:27 +09:00
parent c3dec3507d
commit a5f6e97ac4
4 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sphinx/templates/quickstart/Makefile.new_t
View File

@ -3,7 +3,7 @@
# You can set these variables from the command line. # You can set these variables from the command line.
SPHINXOPTS = SPHINXOPTS =
SPHINXBUILD = python -msphinx SPHINXBUILD = sphinx-build
SPHINXPROJ = {{ project_fn }} SPHINXPROJ = {{ project_fn }}
SOURCEDIR = {{ rsrcdir }} SOURCEDIR = {{ rsrcdir }}
BUILDDIR = {{ rbuilddir }} BUILDDIR = {{ rbuilddir }}

2
sphinx/templates/quickstart/Makefile_t
View File

@ -3,7 +3,7 @@
# You can set these variables from the command line. # You can set these variables from the command line.
SPHINXOPTS = SPHINXOPTS =
SPHINXBUILD = python -msphinx SPHINXBUILD = sphinx-build
PAPER = PAPER =
BUILDDIR = {{ rbuilddir }} BUILDDIR = {{ rbuilddir }}

10
sphinx/templates/quickstart/make.bat.new_t
View File

@ -5,7 +5,7 @@ pushd %~dp0
REM Command file for Sphinx documentation REM Command file for Sphinx documentation
if "%SPHINXBUILD%" == "" ( if "%SPHINXBUILD%" == "" (
set SPHINXBUILD=python -msphinx set SPHINXBUILD=sphinx-build
) )
set SOURCEDIR={{ rsrcdir }} set SOURCEDIR={{ rsrcdir }}
set BUILDDIR={{ rbuilddir }} set BUILDDIR={{ rbuilddir }}
@ -16,10 +16,10 @@ if "%1" == "" goto help
%SPHINXBUILD% >NUL 2>NUL %SPHINXBUILD% >NUL 2>NUL
if errorlevel 9009 ( if errorlevel 9009 (
echo. echo.
echo.The Sphinx module was not found. Make sure you have Sphinx installed, echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
echo.then set the SPHINXBUILD environment variable to point to the full echo.installed, then set the SPHINXBUILD environment variable to point
echo.path of the 'sphinx-build' executable. Alternatively you may add the echo.to the full path of the 'sphinx-build' executable. Alternatively you
echo.Sphinx directory to PATH. echo.may add the Sphinx directory to PATH.
echo. echo.
echo.If you don't have Sphinx installed, grab it from echo.If you don't have Sphinx installed, grab it from
echo.http://sphinx-doc.org/ echo.http://sphinx-doc.org/

23
sphinx/templates/quickstart/make.bat_t
View File

@ -5,7 +5,7 @@ REM Command file for Sphinx documentation
pushd %~dp0 pushd %~dp0
if "%SPHINXBUILD%" == "" ( if "%SPHINXBUILD%" == "" (
set SPHINXBUILD=python -msphinx set SPHINXBUILD=sphinx-build
) )
set BUILDDIR={{ rbuilddir }} set BUILDDIR={{ rbuilddir }}
set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% {{ rsrcdir }} set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% {{ rsrcdir }}
@ -52,20 +52,29 @@ if "%1" == "clean" (
) )
REM Check if sphinx-build is available REM Check if sphinx-build is available and fallback to Python version if any
%SPHINXBUILD% 1>NUL 2>NUL %SPHINXBUILD% 1>NUL 2>NUL
if errorlevel 1 ( if errorlevel 9009 goto sphinx_python
goto sphinx_ok
:sphinx_python
set SPHINXBUILD=python -m sphinx.__init__
%SPHINXBUILD% 2> nul
if errorlevel 9009 (
echo. echo.
echo.The Sphinx module was not found. Make sure you have Sphinx installed, echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
echo.then set the SPHINXBUILD environment variable to point to the full echo.installed, then set the SPHINXBUILD environment variable to point
echo.path of the 'sphinx-build' executable. Alternatively you may add the echo.to the full path of the 'sphinx-build' executable. Alternatively you
echo.Sphinx directory to PATH. echo.may add the Sphinx directory to PATH.
echo. echo.
echo.If you don't have Sphinx installed, grab it from echo.If you don't have Sphinx installed, grab it from
echo.http://sphinx-doc.org/ echo.http://sphinx-doc.org/
exit /b 1 exit /b 1
) )
:sphinx_ok
if "%1" == "html" ( if "%1" == "html" (
%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html