Make zlib builtin.
This commit is contained in:
Martin v. Löwis
parent
70cef449ca
commit
4e6aff5e9b
|
|
@ -56,6 +56,7 @@ extern void initparser(void);
|
|||
extern void init_winreg(void);
|
||||
extern void initdatetime(void);
|
||||
extern void initfunctional(void);
|
||||
extern void initzlib(void);
|
||||
|
||||
extern void init_multibytecodec(void);
|
||||
extern void init_codecs_cn(void);
|
||||
|
|
@ -133,7 +134,8 @@ struct _inittab _PyImport_Inittab[] = {
|
|||
|
||||
{"xxsubtype", initxxsubtype},
|
||||
{"zipimport", initzipimport},
|
||||
|
||||
{"zlib", initzlib},
|
||||
|
||||
/* CJK codecs */
|
||||
{"_multibytecodec", init_multibytecodec},
|
||||
{"_codecs_cn", init_codecs_cn},
|
||||
|
|
|
|||
|
|
@ -74,11 +74,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsound", "winsound.vcproj
|
|||
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib.vcproj", "{680CDC79-9CCA-4282-9A8D-927CB0DB55B2}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_elementtree", "_elementtree.vcproj", "{1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
|
||||
|
|
@ -180,12 +175,6 @@ Global
|
|||
{51F35FAE-FB92-4B2C-9187-1542C065AD77}.Release.Build.0 = Release|Win32
|
||||
{51F35FAE-FB92-4B2C-9187-1542C065AD77}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32
|
||||
{51F35FAE-FB92-4B2C-9187-1542C065AD77}.ReleaseItanium.Build.0 = ReleaseItanium|Win32
|
||||
{680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.Debug.ActiveCfg = Debug|Win32
|
||||
{680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.Debug.Build.0 = Debug|Win32
|
||||
{680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.Release.ActiveCfg = Release|Win32
|
||||
{680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.Release.Build.0 = Release|Win32
|
||||
{680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32
|
||||
{680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.ReleaseItanium.Build.0 = ReleaseItanium|Win32
|
||||
{1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.Debug.ActiveCfg = Debug|Win32
|
||||
{1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.Debug.Build.0 = Debug|Win32
|
||||
{1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.Release.ActiveCfg = Release|Win32
|
||||
|
|
|
|||
|
|
@ -226,6 +226,67 @@
|
|||
<References>
|
||||
</References>
|
||||
<Files>
|
||||
<Filter
|
||||
Name="zlib"
|
||||
Filter="">
|
||||
<File
|
||||
RelativePath="..\Modules\zlib\adler32.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Modules\zlib\compress.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Modules\zlib\crc32.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Modules\zlib\deflate.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Modules\zlib\gzio.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Modules\zlib\infback.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Modules\zlib\inffast.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Modules\zlib\inflate.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Modules\zlib\inftrees.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Modules\zlib\trees.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Modules\zlib\uncompr.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Modules\zlibmodule.c">
|
||||
<FileConfiguration
|
||||
Name="Release|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories="..\Modules\zlib"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories="..\Modules\zlib"/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="ReleaseItanium|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories="..\Modules\zlib"/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Modules\zlib\zutil.c">
|
||||
</File>
|
||||
</Filter>
|
||||
<File
|
||||
RelativePath="..\Modules\_bisectmodule.c">
|
||||
</File>
|
||||
|
|
|
|||
|
|
@ -124,21 +124,6 @@ _tkinter
|
|||
nmake -f makefile.vc
|
||||
nmake -f makefile.vc install
|
||||
|
||||
zlib
|
||||
Python wrapper for the zlib compression library. Get the source code
|
||||
for version 1.2.3 from a convenient mirror at:
|
||||
http://www.gzip.org/zlib/
|
||||
Unpack into dist\zlib-1.2.3.
|
||||
A custom pre-link step in the zlib project settings should manage to
|
||||
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.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.
|
||||
When building zlib.pyd for Itanium, the pre-link build step won't work,
|
||||
so you will need to invoke nmake manually, using an IA64 build
|
||||
environment.
|
||||
|
||||
bz2
|
||||
Python wrapper for the libbz2 compression library. Homepage
|
||||
http://sources.redhat.com/bzip2/
|
||||
|
|
|
|||
|
|
@ -1,245 +0,0 @@
|
|||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="7.10"
|
||||
Name="zlib"
|
||||
RootNamespace="zlib"
|
||||
SccProjectName="zlib"
|
||||
SccLocalPath="..">
|
||||
<Platforms>
|
||||
<Platform
|
||||
Name="Win32"/>
|
||||
</Platforms>
|
||||
<Configurations>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
OutputDirectory=".\."
|
||||
IntermediateDirectory=".\x86-temp-debug\zlib"
|
||||
ConfigurationType="2"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="FALSE">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\Include,..\PC,..\..\zlib-1.2.3"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
|
||||
RuntimeLibrary="3"
|
||||
UsePrecompiledHeader="2"
|
||||
PrecompiledHeaderFile=".\x86-temp-debug\zlib/zlib.pch"
|
||||
AssemblerListingLocation=".\x86-temp-debug\zlib/"
|
||||
ObjectFile=".\x86-temp-debug\zlib/"
|
||||
ProgramDataBaseFileName=".\x86-temp-debug\zlib/"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="TRUE"
|
||||
DebugInformationFormat="3"
|
||||
CompileAs="0"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="..\..\zlib-1.2.3\zlib.lib"
|
||||
OutputFile="./zlib_d.pyd"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
IgnoreDefaultLibraryNames="libc;msvcrt"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile=".\./zlib_d.pdb"
|
||||
SubSystem="2"
|
||||
BaseAddress="0x1e1B0000"
|
||||
ImportLibrary=".\./zlib_d.lib"
|
||||
TargetMachine="1"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
MkTypLibCompatible="TRUE"
|
||||
SuppressStartupBanner="TRUE"
|
||||
TargetEnvironment="1"
|
||||
TypeLibraryName=".\./zlib.tlb"
|
||||
HeaderFileName=""/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
Description="Checking static zlib has been built"
|
||||
CommandLine="cd ..\..\zlib-1.2.3
|
||||
nmake -nologo -f win32\Makefile.msc zlib.lib
|
||||
"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
Culture="1033"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory=".\."
|
||||
IntermediateDirectory=".\x86-temp-release\zlib"
|
||||
ConfigurationType="2"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="FALSE">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\Include,..\PC,..\..\zlib-1.2.3"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="2"
|
||||
EnableFunctionLevelLinking="TRUE"
|
||||
UsePrecompiledHeader="2"
|
||||
PrecompiledHeaderFile=".\x86-temp-release\zlib/zlib.pch"
|
||||
AssemblerListingLocation=".\x86-temp-release\zlib/"
|
||||
ObjectFile=".\x86-temp-release\zlib/"
|
||||
ProgramDataBaseFileName=".\x86-temp-release\zlib/"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="TRUE"
|
||||
DebugInformationFormat="3"
|
||||
CompileAs="0"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="..\..\zlib-1.2.3\zlib.lib"
|
||||
OutputFile="./zlib.pyd"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
IgnoreDefaultLibraryNames="libc"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile=".\./zlib.pdb"
|
||||
SubSystem="2"
|
||||
BaseAddress="0x1e1B0000"
|
||||
ImportLibrary=".\./zlib.lib"
|
||||
TargetMachine="1"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
MkTypLibCompatible="TRUE"
|
||||
SuppressStartupBanner="TRUE"
|
||||
TargetEnvironment="1"
|
||||
TypeLibraryName=".\./zlib.tlb"
|
||||
HeaderFileName=""/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
Description="Checking static zlib has been built"
|
||||
CommandLine="cd ..\..\zlib-1.2.3
|
||||
nmake -nologo -f win32\Makefile.msc zlib.lib
|
||||
"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
Culture="1033"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="ReleaseItanium|Win32"
|
||||
OutputDirectory="./."
|
||||
IntermediateDirectory=".\ia64-temp-release\zlib"
|
||||
ConfigurationType="2"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="FALSE">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
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.3"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
|
||||
StringPooling="TRUE"
|
||||
BasicRuntimeChecks="0"
|
||||
RuntimeLibrary="2"
|
||||
BufferSecurityCheck="FALSE"
|
||||
EnableFunctionLevelLinking="TRUE"
|
||||
UsePrecompiledHeader="2"
|
||||
PrecompiledHeaderFile=".\ia64-temp-release\zlib/zlib.pch"
|
||||
AssemblerListingLocation=".\ia64-temp-release\zlib/"
|
||||
ObjectFile=".\ia64-temp-release\zlib/"
|
||||
ProgramDataBaseFileName=".\ia64-temp-release\zlib/"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="TRUE"
|
||||
Detect64BitPortabilityProblems="TRUE"
|
||||
DebugInformationFormat="3"
|
||||
CompileAs="0"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
|
||||
AdditionalDependencies="..\..\zlib-1.2.3\zlib.lib"
|
||||
OutputFile="./zlib.pyd"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
IgnoreDefaultLibraryNames="libc"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile=".\./zlib.pdb"
|
||||
SubSystem="2"
|
||||
BaseAddress="0x1e1B0000"
|
||||
ImportLibrary=".\./zlib.lib"
|
||||
TargetMachine="0"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
MkTypLibCompatible="TRUE"
|
||||
SuppressStartupBanner="TRUE"
|
||||
TargetEnvironment="1"
|
||||
TypeLibraryName=".\./zlib.tlb"
|
||||
HeaderFileName=""/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
Description="Checking static zlib has been built"
|
||||
CommandLine="cd ..\..\zlib-1.2.3
|
||||
nmake -nologo -f win32\Makefile.msc zlib.lib
|
||||
"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
Culture="1033"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
<Files>
|
||||
<File
|
||||
RelativePath="..\Modules\zlibmodule.c">
|
||||
</File>
|
||||
</Files>
|
||||
<Globals>
|
||||
</Globals>
|
||||
</VisualStudioProject>
|
||||
|
|
@ -103,7 +103,6 @@ extensions = [
|
|||
'select.pyd',
|
||||
'unicodedata.pyd',
|
||||
'winsound.pyd',
|
||||
'zlib.pyd',
|
||||
'_elementtree.pyd',
|
||||
'_bsddb.pyd',
|
||||
'_socket.pyd',
|
||||
|
|
@ -112,15 +111,9 @@ extensions = [
|
|||
'_tkinter.pyd',
|
||||
]
|
||||
|
||||
if major+minor <= "23":
|
||||
if major+minor <= "24":
|
||||
extensions.extend([
|
||||
'_csv.pyd',
|
||||
'_sre.pyd',
|
||||
'_symtable.pyd',
|
||||
'_winreg.pyd',
|
||||
'datetime.pyd'
|
||||
'mmap.pyd',
|
||||
'parser.pyd',
|
||||
'zlib.pyd',
|
||||
])
|
||||
|
||||
# Well-known component UUIDs
|
||||
|
|
|
|||
Loading…
Reference in New Issue