diff -r 18432e8885e0 Doc/Makefile --- a/Doc/Makefile Sun May 22 17:35:48 2011 +0200 +++ b/Doc/Makefile Mon May 23 09:05:25 2011 -0400 @@ -37,7 +37,8 @@ @echo " check to run a check for frequent markup errors" @echo " serve to serve the documentation on the localhost (8000)" -# Note: if you update versions here, do the same in make.bat and README.txt +# Note: if you update versions here, do the same in make.bat, README.txt, +# and documenting/building.rst checkout: @if [ ! -d tools/sphinx ]; then \ echo "Checking out Sphinx..."; \ @@ -60,6 +61,8 @@ build: checkout mkdir -p build/$(BUILDER) build/doctrees + $(PYTHON) --version + echo "XXX Building docs requires 2.x, see http://bugs.python.org/issue10224" $(PYTHON) tools/sphinx-build.py $(ALLSPHINXOPTS) @echo diff -r 18432e8885e0 Doc/README.txt --- a/Doc/README.txt Sun May 22 17:35:48 2011 +0200 +++ b/Doc/README.txt Mon May 23 09:05:25 2011 -0400 @@ -33,6 +33,9 @@ HTML output files. To view the generated HTML, point your favorite browser at the top-level index `build/html/index.html` after running "make". +XXX These tools require Python 2.x, see http://bugs.python.org/issue10224. As +such, you will need to specify PYTHON. + To use a Python interpreter that's not called ``python``, use the standard way to set Makefile variables, using e.g. :: diff -r 18432e8885e0 Doc/documenting/building.rst --- a/Doc/documenting/building.rst Sun May 22 17:35:48 2011 +0200 +++ b/Doc/documenting/building.rst Mon May 23 09:05:25 2011 -0400 @@ -54,13 +54,18 @@ A "make update" updates the Subversion checkouts in :file:`tools/`. +.. note:: + The version of tools obtained via "make" are not currently compatible + with Python 3.x; see http://bugs.python.org/issue10224 for details. + As such, you will need to specify PYTHON explicitly. + Without make ------------ You'll need to install the Sphinx package, either by checking it out via :: - svn co http://svn.python.org/projects/external/Sphinx-0.6.5/sphinx tools/sphinx + svn co http://svn.python.org/projects/external/Sphinx-1.0.7/sphinx tools/sphinx or by installing it from PyPI. diff -r 18432e8885e0 Doc/make.bat --- a/Doc/make.bat Sun May 22 17:35:48 2011 +0200 +++ b/Doc/make.bat Mon May 23 09:05:25 2011 -0400 @@ -52,6 +52,7 @@ if not exist build\%1 mkdir build\%1 if not exist build\doctrees mkdir build\doctrees cmd /C %PYTHON% --version +echo "XXX Building docs requires 2.x, see http://bugs.python.org/issue10224" cmd /C %PYTHON% tools\sphinx-build.py -b%1 -dbuild\doctrees . build\%* if "%1" EQU "htmlhelp" "%HTMLHELP%" build\htmlhelp\python%DISTVERSION:.=%.hhp goto end