[Python-3000-checkins] r61137 - in python/branches/py3k: Doc/make.bat Doc/tools/sphinxext/download.html PCbuild/_hashlib.vcproj PCbuild/_ssl.vcproj PCbuild/build_ssl.py PCbuild/pcbuild.sln PCbuild/readme.txt PCbuild/x64.vsprops Tools/buildbot/external.bat
martin.v.loewis
python-3000-checkins at python.org
Fri Feb 29 20:39:26 CET 2008
Author: martin.v.loewis
Date: Fri Feb 29 20:39:25 2008
New Revision: 61137
Added:
python/branches/py3k/PCbuild/_hashlib.vcproj
- copied unchanged from r61136, python/trunk/PCbuild/_hashlib.vcproj
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Doc/make.bat
python/branches/py3k/Doc/tools/sphinxext/download.html
python/branches/py3k/PCbuild/_ssl.vcproj
python/branches/py3k/PCbuild/build_ssl.py
python/branches/py3k/PCbuild/pcbuild.sln
python/branches/py3k/PCbuild/readme.txt
python/branches/py3k/PCbuild/x64.vsprops
python/branches/py3k/Tools/buildbot/external.bat
Log:
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
........
Modified: python/branches/py3k/Doc/make.bat
==============================================================================
--- python/branches/py3k/Doc/make.bat (original)
+++ python/branches/py3k/Doc/make.bat Fri Feb 29 20:39:25 2008
@@ -1,8 +1,9 @@
- at 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\%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
Modified: python/branches/py3k/Doc/tools/sphinxext/download.html
==============================================================================
--- python/branches/py3k/Doc/tools/sphinxext/download.html (original)
+++ python/branches/py3k/Doc/tools/sphinxext/download.html Fri Feb 29 20:39:25 2008
@@ -5,6 +5,9 @@
<h1>Download Python {{ release }} Documentation
{%- if last_updated %} (last updated on {{ last_updated }}){% endif %}</h1>
+<p>Currently, the development documentation isn't packaged for download.</p>
+
+<!--
<p>To download an archive containing all the documents for this version of
Python in one of various formats, follow one of links in this table. The numbers
in the table are the size of the download files in Kilobytes.</p>
@@ -36,18 +39,9 @@
<h2>Problems</h2>
-<p><strong>Printing PDFs using Adobe Acrobat Reader 5.0:</strong> Adobe has
-reportedly admitted that there is a bug in Acrobat Reader 5.0 which causes it
-not to print at least some PDF files generated by pdfTeX. This software is used
-to produce the PDF version of the Python documentation, and our documents
-definately trigger this bug in Acrobat Reader. To print the PDF files, use
-Acrobat Reader 4.x, ghostscript, or xpdf.</p>
-
-<p>Reportedly, Acrobat Reader 6.0 can print these documents without this
-problem, but we've not yet had an opportunity to confirm the report. Sadly,
-version 6.0 is not yet available on Unix platforms.</p>
-
<p>If you have comments or suggestions for the Python documentation, please send
email to <a href="docs at python.org">docs at python.org</a>.</p>
+-->
+
{% endblock %}
Modified: python/branches/py3k/PCbuild/_ssl.vcproj
==============================================================================
--- python/branches/py3k/PCbuild/_ssl.vcproj (original)
+++ python/branches/py3k/PCbuild/_ssl.vcproj Fri Feb 29 20:39:25 2008
@@ -27,7 +27,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a"
+ CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -89,7 +89,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a"
+ CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -153,7 +153,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a"
+ CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -216,7 +216,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a"
+ CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -280,7 +280,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a"
+ CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -343,7 +343,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a"
+ CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -408,7 +408,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a"
+ CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -471,7 +471,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a"
+ CommandLine="cd "$(SolutionDir)"
"$(PythonExe)" build_ssl.py Release $(PlatformName) -a
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -535,10 +535,6 @@
Name="Source Files"
>
<File
- RelativePath="..\Modules\_hashopenssl.c"
- >
- </File>
- <File
RelativePath="..\Modules\_ssl.c"
>
</File>
Modified: python/branches/py3k/PCbuild/build_ssl.py
==============================================================================
--- python/branches/py3k/PCbuild/build_ssl.py (original)
+++ python/branches/py3k/PCbuild/build_ssl.py Fri Feb 29 20:39:25 2008
@@ -102,8 +102,11 @@
"""
if not os.path.isfile(m32):
return
- with open(m32) as fin:
- with open(makefile, 'w') as fout:
+ # 2.4 compatibility
+ fin = open(m32)
+ if 1: # with open(m32) as fin:
+ fout = open(makefile, 'w')
+ if 1: # with open(makefile, 'w') as fout:
for line in fin:
line = line.replace("=tmp32", "=tmp64")
line = line.replace("=out32", "=out64")
@@ -121,9 +124,13 @@
"""
if not os.path.isfile(makefile):
return
- with open(makefile) as fin:
+ # 2.4 compatibility
+ fin = open(makefile)
+ if 1: # with open(makefile) as fin:
lines = fin.readlines()
- with open(makefile, 'w') as fout:
+ fin.close()
+ fout = open(makefile, 'w')
+ if 1: # with open(makefile, 'w') as fout:
for line in lines:
if line.startswith("PERL="):
continue
@@ -139,6 +146,7 @@
line = line + noalgo
line = line + '\n'
fout.write(line)
+ fout.close()
def run_configure(configure, do_script):
print("perl Configure "+configure)
Modified: python/branches/py3k/PCbuild/pcbuild.sln
==============================================================================
--- python/branches/py3k/PCbuild/pcbuild.sln (original)
+++ python/branches/py3k/PCbuild/pcbuild.sln Fri Feb 29 20:39:25 2008
@@ -108,6 +108,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -464,6 +466,22 @@
{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGUpdate|x64.ActiveCfg = Release|Win32
{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Release|Win32.ActiveCfg = Release|Win32
{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Release|x64.ActiveCfg = Release|Win32
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.Debug|Win32.ActiveCfg = Debug|Win32
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.Debug|Win32.Build.0 = Debug|Win32
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.Debug|x64.ActiveCfg = Debug|x64
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.Debug|x64.Build.0 = Debug|x64
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.PGInstrument|x64.Build.0 = PGInstrument|x64
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.PGUpdate|x64.Build.0 = PGUpdate|x64
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.Release|Win32.ActiveCfg = Release|Win32
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.Release|Win32.Build.0 = Release|Win32
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.Release|x64.ActiveCfg = Release|x64
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: python/branches/py3k/PCbuild/readme.txt
==============================================================================
--- python/branches/py3k/PCbuild/readme.txt (original)
+++ python/branches/py3k/PCbuild/readme.txt Fri Feb 29 20:39:25 2008
@@ -303,7 +303,8 @@
------------------
The build process for AMD64 / x64 is very similar to standard builds. You just
-have to set x64 as platform.
+have to set x64 as platform. In addition, the HOST_PYTHON environment variable
+must point to a Python interpreter (at least 2.4), to support cross-compilation.
Building Python Using the free MS Toolkit Compiler
--------------------------------------------------
Modified: python/branches/py3k/PCbuild/x64.vsprops
==============================================================================
--- python/branches/py3k/PCbuild/x64.vsprops (original)
+++ python/branches/py3k/PCbuild/x64.vsprops Fri Feb 29 20:39:25 2008
@@ -15,4 +15,8 @@
Name="VCLinkerTool"
TargetMachine="17"
/>
+ <UserMacro
+ Name="PythonExe"
+ Value="$(HOST_PYTHON)"
+ />
</VisualStudioPropertySheet>
Modified: python/branches/py3k/Tools/buildbot/external.bat
==============================================================================
--- python/branches/py3k/Tools/buildbot/external.bat (original)
+++ python/branches/py3k/Tools/buildbot/external.bat Fri Feb 29 20:39:25 2008
@@ -8,9 +8,14 @@
if not exist bzip2-1.0.3 svn export http://svn.python.org/projects/external/bzip2-1.0.3
@rem Sleepycat db
-if not exist db-4.4.20 svn export http://svn.python.org/projects/external/db-4.4.20
+ at rem Remove VS 2003 builds
+if exist db-4.4.20 if not exist db-4.4.20\build_win32\this_is_for_vs9 (
+ echo Removing old build
+ rd /s/q db-4.4.20
+)
+if not exist db-4.4.20 svn export http://svn.python.org/projects/external/db-4.4.20-vs9 db-4.4.20
if not exist db-4.4.20\build_win32\debug\libdb44sd.lib (
- vcbuild db-4.4.20\build_win32\Berkeley_DB.sln /build Debug /project db_static
+ vcbuild db-4.4.20\build_win32\db_static.vcproj "Debug|Win32"
)
@rem OpenSSL
More information about the Python-3000-checkins
mailing list