Commit 2d0a990
martin.v.loewis
Switch to bzip2 1.0.5.
git-svn-id: http://svn.python.org/projects/python/trunk@64239 6015fed2-1504-0410-9fe1-9d1591cc47711 parent 7c063d9 commit 2d0a990
4 files changed
Lines changed: 12 additions & 9 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -307,7 +307,7 @@ Library | |||
| 307 | 307 | Build | |
| 308 | 308 | ----- | |
| 309 | 309 | ||
| 310 | - - The Windows installer now includes Tk 8.5. | ||
| 310 | + - The Windows installer now includes Tk 8.5 and bzip2 1.0.5. | ||
| 311 | 311 | ||
| 312 | 312 | - Patch #1722225: Support QNX 6. | |
| 313 | 313 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -78,7 +78,7 @@ | |||
| 78 | 78 | /> | |
| 79 | 79 | <UserMacro | |
| 80 | 80 | Name="bz2Dir" | |
| 81 | - Value="$(externalsDir)\bzip2-1.0.3" | ||
| 81 | + Value="$(externalsDir)\bzip2-1.0.5" | ||
| 82 | 82 | /> | |
| 83 | 83 | <UserMacro | |
| 84 | 84 | Name="opensslDir" | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -121,21 +121,21 @@ bz2 | |||
| 121 | 121 | Download the source from the python.org copy into the dist | |
| 122 | 122 | directory: | |
| 123 | 123 | ||
| 124 | - svn export http://svn.python.org/projects/external/bzip2-1.0.3 | ||
| 124 | + svn export http://svn.python.org/projects/external/bzip2-1.0.5 | ||
| 125 | 125 | ||
| 126 | 126 | ** NOTE: if you use the Tools\buildbot\external(-amd64).bat approach for | |
| 127 | 127 | obtaining external sources then you don't need to manually get the source | |
| 128 | 128 | above via subversion. ** | |
| 129 | 129 | ||
| 130 | 130 | A custom pre-link step in the bz2 project settings should manage to | |
| 131 | - build bzip2-1.0.3\libbz2.lib by magic before bz2.pyd (or bz2_d.pyd) is | ||
| 131 | + build bzip2-1.0.5\libbz2.lib by magic before bz2.pyd (or bz2_d.pyd) is | ||
| 132 | 132 | linked in PCbuild\. | |
| 133 | 133 | However, the bz2 project is not smart enough to remove anything under | |
| 134 | - bzip2-1.0.3\ when you do a clean, so if you want to rebuild bzip2.lib | ||
| 135 | - you need to clean up bzip2-1.0.3\ by hand. | ||
| 134 | + bzip2-1.0.5\ when you do a clean, so if you want to rebuild bzip2.lib | ||
| 135 | + you need to clean up bzip2-1.0.5\ by hand. | ||
| 136 | 136 | ||
| 137 | 137 | All of this managed to build libbz2.lib in | |
| 138 | - bzip2-1.0.3\$platform-$configuration\, which the Python project links in. | ||
| 138 | + bzip2-1.0.5\$platform-$configuration\, which the Python project links in. | ||
| 139 | 139 | ||
| 140 | 140 | _ssl | |
| 141 | 141 | Python wrapper for the secure sockets library. | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -4,7 +4,7 @@ | |||
| 4 | 4 | cd .. | |
| 5 | 5 | @rem XXX: If you need to force the buildbots to start from a fresh environment, uncomment | |
| 6 | 6 | @rem the following, check it in, then check it out, comment it out, then check it back in. | |
| 7 | - @rem if exist bzip2-1.0.3 rd /s/q bzip2-1.0.3 | ||
| 7 | + @rem if exist bzip2-1.0.5 rd /s/q bzip2-1.0.5 | ||
| 8 | 8 | @rem if exist tcltk rd /s/q tcltk | |
| 9 | 9 | @rem if exist tcltk64 rd /s/q tcltk64 | |
| 10 | 10 | @rem if exist tcl8.4.12 rd /s/q tcl8.4.12 | |
@@ -18,7 +18,10 @@ cd .. | |||
| 18 | 18 | @rem if exist sqlite-source-3.3.4 rd /s/q sqlite-source-3.3.4 | |
| 19 | 19 | ||
| 20 | 20 | @rem bzip | |
| 21 | - if not exist bzip2-1.0.3 svn export http://svn.python.org/projects/external/bzip2-1.0.3 | ||
| 21 | + if not exist bzip2-1.0.5 ( | ||
| 22 | + rd /s/q bzip2-1.0.3 | ||
| 23 | + svn export http://svn.python.org/projects/external/bzip2-1.0.5 | ||
| 24 | + ) | ||
| 22 | 25 | ||
| 23 | 26 | @rem Sleepycat db | |
| 24 | 27 | if not exist db-4.4.20 svn export http://svn.python.org/projects/external/db-4.4.20-vs9 db-4.4.20 | |
0 commit comments