traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge heads

This commit is contained in:
Senthil Kumaran 2012-05-16 00:07:55 +08:00
parent b0d85fd1b5 fd0afed503
commit 7cf222229e
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -157,6 +157,8 @@ Tests
Build Build
----- -----
- Build against bzip2 1.0.6 and openssl 0.9.8x on Windows.
- Issue #14557: Fix extensions build on HP-UX. Patch by Adi Roiban. - Issue #14557: Fix extensions build on HP-UX. Patch by Adi Roiban.
- Issue #14437: Fix building the _io module under Cygwin. - Issue #14437: Fix building the _io module under Cygwin.

2
PC/VS8.0/pyproject.vsprops
View File

@ -82,7 +82,7 @@
/> />
<UserMacro <UserMacro
Name="opensslDir" Name="opensslDir"
Value="$(externalsDir)\openssl-0.9.8l" Value="$(externalsDir)\openssl-0.9.8x"
/> />
<UserMacro <UserMacro
Name="tcltkDir" Name="tcltkDir"

2
PCbuild/pyproject.vsprops
View File

@ -82,7 +82,7 @@
/> />
<UserMacro <UserMacro
Name="opensslDir" Name="opensslDir"
Value="$(externalsDir)\openssl-0.9.8l" Value="$(externalsDir)\openssl-0.9.8x"
/> />
<UserMacro <UserMacro
Name="tcltkDir" Name="tcltkDir"

2
PCbuild/readme.txt
View File

@ -142,7 +142,7 @@ _ssl
Get the source code through Get the source code through
svn export http://svn.python.org/projects/external/openssl-0.9.8l svn export http://svn.python.org/projects/external/openssl-0.9.8x
** NOTE: if you use the Tools\buildbot\external(-amd64).bat approach for ** NOTE: if you use the Tools\buildbot\external(-amd64).bat approach for
obtaining external sources then you don't need to manually get the source obtaining external sources then you don't need to manually get the source

4
Tools/buildbot/external-common.bat
View File

@ -15,7 +15,7 @@ cd ..
@rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1 @rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1
@rem if exist db-4.4.20 rd /s/q db-4.4.20 @rem if exist db-4.4.20 rd /s/q db-4.4.20
@rem if exist db-4.7.25.0 rd /s/q db-4.7.25.0 @rem if exist db-4.7.25.0 rd /s/q db-4.7.25.0
@rem if exist openssl-0.9.8l rd /s/q openssl-0.9.8l @rem if exist openssl-0.9.8x rd /s/q openssl-0.9.8x
@rem if exist sqlite-3.6.21 rd /s/q sqlite-3.6.21 @rem if exist sqlite-3.6.21 rd /s/q sqlite-3.6.21
@rem bzip @rem bzip
@ -29,7 +29,7 @@ if exist db-4.4.20 rd /s/q db-4.4.20
if not exist db-4.7.25.0 svn export http://svn.python.org/projects/external/db-4.7.25.0 if not exist db-4.7.25.0 svn export http://svn.python.org/projects/external/db-4.7.25.0
@rem OpenSSL @rem OpenSSL
if not exist openssl-0.9.8l svn export http://svn.python.org/projects/external/openssl-0.9.8l if not exist openssl-0.9.8x svn export http://svn.python.org/projects/external/openssl-0.9.8x
@rem tcl/tk @rem tcl/tk
if not exist tcl-8.5.2.1 ( if not exist tcl-8.5.2.1 (