[Python-checkins] devguide: Issue #23951: Clean up rstlint makefile integration

[zach.ware]

https://hg.python.org/devguide/rev/0f642c1ba901
changeset:   821:0f642c1ba901
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Thu Jul 21 10:35:23 2016 -0500
summary:
  Issue #23951: Clean up rstlint makefile integration

files:
  Makefile |   4 +++-
  make.bat |  14 ++++----------
  2 files changed, 7 insertions(+), 11 deletions(-)


diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@
 #
 
 # You can set these variables from the command line.
+PYTHON        = python3
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
 PAPER         =
@@ -12,7 +13,8 @@
 PAPEROPT_letter = -D latex_paper_size=letter
 ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp \
+        devhelp epub latex latexpdf text man changes linkcheck doctest check
 
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
diff --git a/make.bat b/make.bat
--- a/make.bat
+++ b/make.bat
@@ -2,6 +2,9 @@
 
 REM Command file for Sphinx documentation
 
+if "%PYTHON%" == "" (
+	set PYTHON=py -3
+)
 if "%SPHINXBUILD%" == "" (
 	set SPHINXBUILD=sphinx-build
 )
@@ -169,17 +172,8 @@
 	goto end
 )
 
-if "%1" == "rstlint" (
-	%SPHINXBUILD% -b rstlint %ALLSPHINXOPTS% %BUILDDIR%/rstlint
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Testing of rst and py files in the documentation finished, look at the ^
-results in %BUILDDIR%/rstlint/output.txt.
-	goto end
-)
-
 :check
-cmd /C %PYTHON% tools\rstlint.py -i tools
+cmd /C %PYTHON% tools\rstlint.py -i tools -i venv
 goto end
 
 :end

-- 
Repository URL: https://hg.python.org/devguide