diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-02-29 19:39:25 +0000 |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-02-29 19:39:25 +0000 |
| commit | b45fbca3715b540c8d7b76e7fe1d096e0fc600c4 (patch) | |
| tree | cb09ab0c8cb7270045f2532103b7cfbd97137de7 /Doc/make.bat | |
| parent | 4d11261cd07e668f7e6fa0bd30e4d1853f8b388b (diff) | |
| download | cpython-b45fbca3715b540c8d7b76e7fe1d096e0fc600c4.tar.gz | |
Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61062,61066,61068,61070,61083,61085,61092-61097,61103-61104,61110-61112,61114-61115,61117,61120-61122,61126-61136 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r61128 | martin.v.loewis | 2008-02-29 17:59:21 +0100 (Fr, 29 Feb 2008) | 1 line
Make _hashlib a separate project.
........
r61132 | georg.brandl | 2008-02-29 19:15:36 +0100 (Fr, 29 Feb 2008) | 2 lines
Until we got downloadable docs, stop confusing viewers by talking about a nonexisting table.
........
r61133 | martin.v.loewis | 2008-02-29 19:17:23 +0100 (Fr, 29 Feb 2008) | 1 line
Build db-4.4.20 with VS9; remove VS2003 build if necessary.
........
r61135 | georg.brandl | 2008-02-29 19:21:29 +0100 (Fr, 29 Feb 2008) | 2 lines
#2208: allow for non-standard HHC location.
........
r61136 | martin.v.loewis | 2008-02-29 19:54:45 +0100 (Fr, 29 Feb 2008) | 1 line
Port build_ssl.py to 2.4; support HOST_PYTHON variable
........
Diffstat (limited to 'Doc/make.bat')
| -rw-r--r-- | Doc/make.bat | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Doc/make.bat b/Doc/make.bat index a26851fb78..504e4b58e4 100644 --- a/Doc/make.bat +++ b/Doc/make.bat @@ -1,8 +1,9 @@ -@echo off
+@@echo off
setlocal
set SVNROOT=http://svn.python.org/projects
-if "%PYTHON%" EQU "" set PYTHON=python25
+if "%PYTHON%" EQU "" set PYTHON=..\pcbuild\python
+if "%HTMLHELP%" EQU "" set HTMLHELP=%ProgramFiles%\HTML Help Workshop\hhc.exe
if "%1" EQU "" goto help
if "%1" EQU "html" goto build
@@ -41,7 +42,7 @@ if not exist build mkdir build if not exist build\%1 mkdir build\%1
if not exist build\doctrees mkdir build\doctrees
cmd /C %PYTHON% tools\sphinx-build.py -b%1 -dbuild\doctrees . build\%1
-if "%1" EQU "htmlhelp" "%ProgramFiles%\HTML Help Workshop\hhc.exe" build\htmlhelp\pydoc.hhp
+if "%1" EQU "htmlhelp" "%HTMLHELP%" build\htmlhelp\pydoc.hhp
goto end
:webrun
|