Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 87960da

Browse files
loewisloewis
committed
Upgrade bzip2 to 1.0.6.
1 parent e768b06 commit 87960da

8 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎PC/VC6/bz2.dsp‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎PC/VC6/readme.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,14 @@ bz2
120120
Download the source from the python.org copy into the dist
121121
directory:
122122

123-
svn export http://svn.python.org/projects/external/bzip2-1.0.5
123+
svn export http://svn.python.org/projects/external/bzip2-1.0.6
124124

125125
And requires building bz2 first.
126126

127-
cd dist\bzip2-1.0.5
127+
cd dist\bzip2-1.0.6
128128
nmake -f makefile.msc
129129

130-
All of this managed to build bzip2-1.0.5\libbz2.lib, which the Python
130+
All of this managed to build bzip2-1.0.6\libbz2.lib, which the Python
131131
project links in.
132132

133133

‎PC/VS8.0/bz2.vcproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@
532532
</File>
533533
</Filter>
534534
<Filter
535-
Name="bzip2 1.0.5 Header Files"
535+
Name="bzip2 1.0.6 Header Files"
536536
>
537537
<File
538538
RelativePath="$(bz2Dir)\bzlib.h"
@@ -544,7 +544,7 @@
544544
</File>
545545
</Filter>
546546
<Filter
547-
Name="bzip2 1.0.5 Source Files"
547+
Name="bzip2 1.0.6 Source Files"
548548
>
549549
<File
550550
RelativePath="$(bz2Dir)\blocksort.c"

‎PC/VS8.0/pyproject.vsprops‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
/>
5555
<UserMacro
5656
Name="bz2Dir"
57-
Value="$(externalsDir)\bzip2-1.0.5"
57+
Value="$(externalsDir)\bzip2-1.0.6"
5858
/>
5959
<UserMacro
6060
Name="opensslDir"

‎PCbuild/bz2.vcproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@
532532
</File>
533533
</Filter>
534534
<Filter
535-
Name="bzip2 1.0.5 Header Files"
535+
Name="bzip2 1.0.6 Header Files"
536536
>
537537
<File
538538
RelativePath="$(bz2Dir)\bzlib.h"
@@ -544,7 +544,7 @@
544544
</File>
545545
</Filter>
546546
<Filter
547-
Name="bzip2 1.0.5 Source Files"
547+
Name="bzip2 1.0.6 Source Files"
548548
>
549549
<File
550550
RelativePath="$(bz2Dir)\blocksort.c"

‎PCbuild/pyproject.vsprops‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
/>
5555
<UserMacro
5656
Name="bz2Dir"
57-
Value="$(externalsDir)\bzip2-1.0.5"
57+
Value="$(externalsDir)\bzip2-1.0.6"
5858
/>
5959
<UserMacro
6060
Name="opensslDir"

‎PCbuild/readme.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,21 +118,21 @@ bz2
118118
Download the source from the python.org copy into the dist
119119
directory:
120120

121-
svn export http://svn.python.org/projects/external/bzip2-1.0.5
121+
svn export http://svn.python.org/projects/external/bzip2-1.0.6
122122

123123
** NOTE: if you use the Tools\buildbot\external(-amd64).bat approach for
124124
obtaining external sources then you don't need to manually get the source
125125
above via subversion. **
126126

127127
A custom pre-link step in the bz2 project settings should manage to
128-
build bzip2-1.0.5\libbz2.lib by magic before bz2.pyd (or bz2_d.pyd) is
128+
build bzip2-1.0.6\libbz2.lib by magic before bz2.pyd (or bz2_d.pyd) is
129129
linked in PCbuild\.
130130
However, the bz2 project is not smart enough to remove anything under
131-
bzip2-1.0.5\ when you do a clean, so if you want to rebuild bzip2.lib
132-
you need to clean up bzip2-1.0.5\ by hand.
131+
bzip2-1.0.6\ when you do a clean, so if you want to rebuild bzip2.lib
132+
you need to clean up bzip2-1.0.6\ by hand.
133133

134134
All of this managed to build libbz2.lib in
135-
bzip2-1.0.5\$platform-$configuration\, which the Python project links in.
135+
bzip2-1.0.6\$platform-$configuration\, which the Python project links in.
136136

137137
_ssl
138138
Python wrapper for the secure sockets library.

‎Tools/buildbot/external-common.bat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
cd ..
55
@rem XXX: If you need to force the buildbots to start from a fresh environment, uncomment
66
@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.5 rd /s/q bzip2-1.0.5
7+
@rem if exist bzip2-1.0.6 rd /s/q bzip2-1.0.6
88
@rem if exist tcltk rd /s/q tcltk
99
@rem if exist tcltk64 rd /s/q tcltk64
1010
@rem if exist tcl8.4.12 rd /s/q tcl8.4.12
@@ -18,9 +18,9 @@ cd ..
1818
@rem if exist sqlite-3.7.4 rd /s/q sqlite-3.7.4
1919

2020
@rem bzip
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
21+
if not exist bzip2-1.0.6 (
22+
rd /s/q bzip2-1.0.5
23+
svn export http://svn.python.org/projects/external/bzip2-1.0.6
2424
)
2525

2626
@rem Sleepycat db

0 commit comments

Comments
 (0)