[Martin v. L?wis wrote]
> Raymond Hettinger wrote:
> >>I'd guess this belongs in 2.5, with a possible retrofit for 2.4.
> >
> >
> > +1 on backporting, but that is up to Anthony.
>
> Correct me if I'm wrong - but there isn't much "porting" to this.
> AFAICT, this is only relevant for the Windows build (i.e. which
> version is used in the binaries). For the source distribution, there
> should be no change (except for PCbuild/readme.txt, which should
> reflect the version that is used in the Windows build). FWIW,
> this currently talks about 1.2.1.
Here is a patch to do this (attached) that works on the trunk and
against the Python-2.4.1.tgz source tarball. Shall I check this into the
HEAD and release24-maint?
Trent
--
Trent Mick
[EMAIL PROTECTED]
Index: PCbuild/readme.txt
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/readme.txt,v
retrieving revision 1.59
diff -u -r1.59 readme.txt
--- python/PCbuild/readme.txt 6 Jul 2005 19:34:10 -0000 1.59
+++ python/PCbuild/readme.txt 26 Jul 2005 00:53:17 -0000
@@ -126,15 +126,15 @@
zlib
Python wrapper for the zlib compression library. Get the source code
- for version 1.2.1 from a convenient mirror at:
+ for version 1.2.3 from a convenient mirror at:
http://www.gzip.org/zlib/
- Unpack into dist\zlib-1.2.1.
+ Unpack into dist\zlib-1.2.3.
A custom pre-link step in the zlib project settings should manage to
- build zlib-1.2.1\zlib.lib by magic before zlib.pyd (or zlib_d.pyd) is
+ build zlib-1.2.3\zlib.lib by magic before zlib.pyd (or zlib_d.pyd) is
linked in PCbuild\.
However, the zlib project is not smart enough to remove anything under
- zlib-1.2.1\ when you do a clean, so if you want to rebuild zlib.lib
- you need to clean up zlib-1.2.1\ by hand.
+ zlib-1.2.3\ when you do a clean, so if you want to rebuild zlib.lib
+ you need to clean up zlib-1.2.3\ by hand.
bz2
Python wrapper for the libbz2 compression library. Homepage
Index: PCbuild/zlib.vcproj
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/zlib.vcproj,v
retrieving revision 1.6
diff -u -r1.6 zlib.vcproj
--- python/PCbuild/zlib.vcproj 20 Jul 2004 14:37:48 -0000 1.6
+++ python/PCbuild/zlib.vcproj 26 Jul 2005 00:53:17 -0000
@@ -21,7 +21,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="..\Include,..\PC,..\..\zlib-1.2.1"
+
AdditionalIncludeDirectories="..\Include,..\PC,..\..\zlib-1.2.3"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
@@ -37,7 +37,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
-
AdditionalDependencies="..\..\zlib-1.2.1\zlib.lib"
+
AdditionalDependencies="..\..\zlib-1.2.3\zlib.lib"
OutputFile="./zlib_d.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@@ -63,7 +63,7 @@
<Tool
Name="VCPreLinkEventTool"
Description="Checking static zlib has been
built"
- CommandLine="cd ..\..\zlib-1.2.1
+ CommandLine="cd ..\..\zlib-1.2.3
nmake -nologo -f win32\Makefile.msc zlib.lib
"/>
<Tool
@@ -92,7 +92,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
-
AdditionalIncludeDirectories="..\Include,..\PC,..\..\zlib-1.2.1"
+
AdditionalIncludeDirectories="..\Include,..\PC,..\..\zlib-1.2.3"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -110,7 +110,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
-
AdditionalDependencies="..\..\zlib-1.2.1\zlib.lib"
+
AdditionalDependencies="..\..\zlib-1.2.3\zlib.lib"
OutputFile="./zlib.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@@ -136,7 +136,7 @@
<Tool
Name="VCPreLinkEventTool"
Description="Checking static zlib has been
built"
- CommandLine="cd ..\..\zlib-1.2.1
+ CommandLine="cd ..\..\zlib-1.2.3
nmake -nologo -f win32\Makefile.msc zlib.lib
"/>
<Tool
@@ -166,7 +166,7 @@
AdditionalOptions=" /USECL:MS_ITANIUM"
Optimization="2"
InlineFunctionExpansion="1"
-
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include,..\PC,..\..\zlib-1.2.1"
+
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include,..\PC,..\..\zlib-1.2.3"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
StringPooling="TRUE"
BasicRuntimeChecks="0"
@@ -188,7 +188,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64
/USELINK:MS_SDK"
-
AdditionalDependencies="..\..\zlib-1.2.1\zlib.lib"
+
AdditionalDependencies="..\..\zlib-1.2.3\zlib.lib"
OutputFile="./zlib.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@@ -214,7 +214,7 @@
<Tool
Name="VCPreLinkEventTool"
Description="Checking static zlib has been
built"
- CommandLine="cd ..\..\zlib-1.2.1
+ CommandLine="cd ..\..\zlib-1.2.3
nmake -nologo -f win32\Makefile.msc zlib.lib
"/>
<Tool
_______________________________________________
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe:
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
