diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2012-05-14 12:13:48 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2012-05-14 12:13:48 (GMT) |
| commit | 87960da3e3a71122acd14cd92d5313e87021c7d4 (patch) | |
| tree | 5b0310c65bf2dfcfe4194df5bc0e08362e292b21 /PC | |
| parent | e768b06f160291ed8c4bc50933e3fc179589516f (diff) | |
| download | cpython-87960da3e3a71122acd14cd92d5313e87021c7d4.zip cpython-87960da3e3a71122acd14cd92d5313e87021c7d4.tar.gz cpython-87960da3e3a71122acd14cd92d5313e87021c7d4.tar.bz2 | |
Upgrade bzip2 to 1.0.6.
Diffstat (limited to 'PC')
| -rw-r--r-- | PC/VC6/bz2.dsp | 8 | ||||
| -rw-r--r-- | PC/VC6/readme.txt | 6 | ||||
| -rw-r--r-- | PC/VS8.0/bz2.vcproj | 4 | ||||
| -rw-r--r-- | PC/VS8.0/pyproject.vsprops | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/PC/VC6/bz2.dsp b/PC/VC6/bz2.dsp index 3c164fa..352cbad 100644 --- a/PC/VC6/bz2.dsp +++ b/PC/VC6/bz2.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir ""
F90=df.exe
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "Py_BUILD_CORE_MODULE" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\Include" /I ".." /I "..\..\..\bzip2-1.0.5" /D "Py_BUILD_CORE_MODULE" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\Include" /I ".." /I "..\..\..\bzip2-1.0.6" /D "Py_BUILD_CORE_MODULE" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 ..\..\..\bzip2-1.0.5\libbz2.lib /nologo /base:"0x1D170000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./bz2.pyd"
+# ADD LINK32 ..\..\..\bzip2-1.0.6\libbz2.lib /nologo /base:"0x1D170000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./bz2.pyd"
# SUBTRACT LINK32 /pdb:none /nodefaultlib
!ELSEIF "$(CFG)" == "bz2 - Win32 Debug"
@@ -72,7 +72,7 @@ LINK32=link.exe # PROP Target_Dir ""
F90=df.exe
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "Py_BUILD_CORE_MODULE" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /I "..\..\..\bzip2-1.0.5" /D "Py_BUILD_CORE_MODULE" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /I "..\..\..\bzip2-1.0.6" /D "Py_BUILD_CORE_MODULE" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -82,7 +82,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ..\..\..\bzip2-1.0.5\libbz2.lib /nologo /base:"0x1D170000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /nodefaultlib:"libc" /out:"./bz2_d.pyd" /pdbtype:sept
+# ADD LINK32 ..\..\..\bzip2-1.0.6\libbz2.lib /nologo /base:"0x1D170000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /nodefaultlib:"libc" /out:"./bz2_d.pyd" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt index 4e8d237..7e85c96 100644 --- a/PC/VC6/readme.txt +++ b/PC/VC6/readme.txt @@ -120,14 +120,14 @@ bz2 Download the source from the python.org copy into the dist directory: - svn export http://svn.python.org/projects/external/bzip2-1.0.5 + svn export http://svn.python.org/projects/external/bzip2-1.0.6 And requires building bz2 first. - cd dist\bzip2-1.0.5 + cd dist\bzip2-1.0.6 nmake -f makefile.msc - All of this managed to build bzip2-1.0.5\libbz2.lib, which the Python + All of this managed to build bzip2-1.0.6\libbz2.lib, which the Python project links in. diff --git a/PC/VS8.0/bz2.vcproj b/PC/VS8.0/bz2.vcproj index a97d1d5..1f11979 100644 --- a/PC/VS8.0/bz2.vcproj +++ b/PC/VS8.0/bz2.vcproj @@ -532,7 +532,7 @@ </File>
</Filter>
<Filter
- Name="bzip2 1.0.5 Header Files"
+ Name="bzip2 1.0.6 Header Files"
>
<File
RelativePath="$(bz2Dir)\bzlib.h"
@@ -544,7 +544,7 @@ </File>
</Filter>
<Filter
- Name="bzip2 1.0.5 Source Files"
+ Name="bzip2 1.0.6 Source Files"
>
<File
RelativePath="$(bz2Dir)\blocksort.c"
diff --git a/PC/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops index 6494216..763f687 100644 --- a/PC/VS8.0/pyproject.vsprops +++ b/PC/VS8.0/pyproject.vsprops @@ -54,7 +54,7 @@ />
<UserMacro
Name="bz2Dir"
- Value="$(externalsDir)\bzip2-1.0.5"
+ Value="$(externalsDir)\bzip2-1.0.6"
/>
<UserMacro
Name="opensslDir"
|