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

Merged revisions 64239 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r64239 | martin.v.loewis | 2008-06-13 19:22:39 +0200 (Fr, 13 Jun 2008) | 1 line

  Switch to bzip2 1.0.5.
........
This commit is contained in:
Martin v. Löwis 2008-06-13 17:28:35 +00:00
parent af065c34bc
commit 70ce8aae98
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PCbuild/pyproject.vsprops
View File

@ -78,7 +78,7 @@
/>
<UserMacro
Name="bz2Dir"
Value="$(externalsDir)\bzip2-1.0.3"
Value="$(externalsDir)\bzip2-1.0.5"
/>
<UserMacro
Name="opensslDir"

10
PCbuild/readme.txt
View File

@ -121,21 +121,21 @@ bz2
Download the source from the python.org copy into the dist
directory:
svn export http://svn.python.org/projects/external/bzip2-1.0.3
svn export http://svn.python.org/projects/external/bzip2-1.0.5
** 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
above via subversion. **
A custom pre-link step in the bz2 project settings should manage to
build bzip2-1.0.3\libbz2.lib by magic before bz2.pyd (or bz2_d.pyd) is
build bzip2-1.0.5\libbz2.lib by magic before bz2.pyd (or bz2_d.pyd) is
linked in PCbuild\.
However, the bz2 project is not smart enough to remove anything under
bzip2-1.0.3\ when you do a clean, so if you want to rebuild bzip2.lib
you need to clean up bzip2-1.0.3\ by hand.
bzip2-1.0.5\ when you do a clean, so if you want to rebuild bzip2.lib
you need to clean up bzip2-1.0.5\ by hand.
All of this managed to build libbz2.lib in
bzip2-1.0.3\$platform-$configuration\, which the Python project links in.
bzip2-1.0.5\$platform-$configuration\, which the Python project links in.
_ssl
Python wrapper for the secure sockets library.

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

@ -4,7 +4,7 @@
cd ..
@rem XXX: If you need to force the buildbots to start from a fresh environment, uncomment
@rem the following, check it in, then check it out, comment it out, then check it back in.
@rem if exist bzip2-1.0.3 rd /s/q bzip2-1.0.3
@rem if exist bzip2-1.0.5 rd /s/q bzip2-1.0.5
@rem if exist tcltk rd /s/q tcltk
@rem if exist tcltk64 rd /s/q tcltk64
@rem if exist tcl8.4.12 rd /s/q tcl8.4.12
@ -18,7 +18,10 @@ cd ..
@rem if exist sqlite-source-3.3.4 rd /s/q sqlite-source-3.3.4
@rem bzip
if not exist bzip2-1.0.3 svn export http://svn.python.org/projects/external/bzip2-1.0.3
if not exist bzip2-1.0.5 (
rd /s/q bzip2-1.0.3
svn export http://svn.python.org/projects/external/bzip2-1.0.5
)
@rem Sleepycat db
if not exist db-4.4.20 svn export http://svn.python.org/projects/external/db-4.4.20-vs9 db-4.4.20