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

Skip to content

Commit 4e6aff5

Browse files
loewisloewis
committed
Make zlib builtin.
1 parent 70cef44 commit 4e6aff5

6 files changed

Lines changed: 66 additions & 281 deletions

File tree

‎PC/config.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ extern void initparser(void);
5656
extern void init_winreg(void);
5757
extern void initdatetime(void);
5858
extern void initfunctional(void);
59+
extern void initzlib(void);
5960

6061
extern void init_multibytecodec(void);
6162
extern void init_codecs_cn(void);
@@ -133,7 +134,8 @@ struct _inittab _PyImport_Inittab[] = {
133134

134135
{"xxsubtype", initxxsubtype},
135136
{"zipimport", initzipimport},
136-
137+
{"zlib", initzlib},
138+
137139
/* CJK codecs */
138140
{"_multibytecodec", init_multibytecodec},
139141
{"_codecs_cn", init_codecs_cn},

‎PCbuild/pcbuild.sln‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsound", "winsound.vcproj
7474
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
7575
EndProjectSection
7676
EndProject
77-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib.vcproj", "{680CDC79-9CCA-4282-9A8D-927CB0DB55B2}"
78-
ProjectSection(ProjectDependencies) = postProject
79-
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
80-
EndProjectSection
81-
EndProject
8277
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_elementtree", "_elementtree.vcproj", "{1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}"
8378
ProjectSection(ProjectDependencies) = postProject
8479
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
@@ -180,12 +175,6 @@ Global
180175
{51F35FAE-FB92-4B2C-9187-1542C065AD77}.Release.Build.0 = Release|Win32
181176
{51F35FAE-FB92-4B2C-9187-1542C065AD77}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32
182177
{51F35FAE-FB92-4B2C-9187-1542C065AD77}.ReleaseItanium.Build.0 = ReleaseItanium|Win32
183-
{680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.Debug.ActiveCfg = Debug|Win32
184-
{680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.Debug.Build.0 = Debug|Win32
185-
{680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.Release.ActiveCfg = Release|Win32
186-
{680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.Release.Build.0 = Release|Win32
187-
{680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32
188-
{680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.ReleaseItanium.Build.0 = ReleaseItanium|Win32
189178
{1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.Debug.ActiveCfg = Debug|Win32
190179
{1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.Debug.Build.0 = Debug|Win32
191180
{1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}.Release.ActiveCfg = Release|Win32

‎PCbuild/pythoncore.vcproj‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,67 @@
226226
<References>
227227
</References>
228228
<Files>
229+
<Filter
230+
Name="zlib"
231+
Filter="">
232+
<File
233+
RelativePath="..\Modules\zlib\adler32.c">
234+
</File>
235+
<File
236+
RelativePath="..\Modules\zlib\compress.c">
237+
</File>
238+
<File
239+
RelativePath="..\Modules\zlib\crc32.c">
240+
</File>
241+
<File
242+
RelativePath="..\Modules\zlib\deflate.c">
243+
</File>
244+
<File
245+
RelativePath="..\Modules\zlib\gzio.c">
246+
</File>
247+
<File
248+
RelativePath="..\Modules\zlib\infback.c">
249+
</File>
250+
<File
251+
RelativePath="..\Modules\zlib\inffast.c">
252+
</File>
253+
<File
254+
RelativePath="..\Modules\zlib\inflate.c">
255+
</File>
256+
<File
257+
RelativePath="..\Modules\zlib\inftrees.c">
258+
</File>
259+
<File
260+
RelativePath="..\Modules\zlib\trees.c">
261+
</File>
262+
<File
263+
RelativePath="..\Modules\zlib\uncompr.c">
264+
</File>
265+
<File
266+
RelativePath="..\Modules\zlibmodule.c">
267+
<FileConfiguration
268+
Name="Release|Win32">
269+
<Tool
270+
Name="VCCLCompilerTool"
271+
AdditionalIncludeDirectories="..\Modules\zlib"/>
272+
</FileConfiguration>
273+
<FileConfiguration
274+
Name="Debug|Win32">
275+
<Tool
276+
Name="VCCLCompilerTool"
277+
AdditionalIncludeDirectories="..\Modules\zlib"/>
278+
</FileConfiguration>
279+
<FileConfiguration
280+
Name="ReleaseItanium|Win32">
281+
<Tool
282+
Name="VCCLCompilerTool"
283+
AdditionalIncludeDirectories="..\Modules\zlib"/>
284+
</FileConfiguration>
285+
</File>
286+
<File
287+
RelativePath="..\Modules\zlib\zutil.c">
288+
</File>
289+
</Filter>
229290
<File
230291
RelativePath="..\Modules\_bisectmodule.c">
231292
</File>

‎PCbuild/readme.txt‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -124,21 +124,6 @@ _tkinter
124124
nmake -f makefile.vc
125125
nmake -f makefile.vc install
126126

127-
zlib
128-
Python wrapper for the zlib compression library. Get the source code
129-
for version 1.2.3 from a convenient mirror at:
130-
http://www.gzip.org/zlib/
131-
Unpack into dist\zlib-1.2.3.
132-
A custom pre-link step in the zlib project settings should manage to
133-
build zlib-1.2.3\zlib.lib by magic before zlib.pyd (or zlib_d.pyd) is
134-
linked in PCbuild\.
135-
However, the zlib project is not smart enough to remove anything under
136-
zlib-1.2.3\ when you do a clean, so if you want to rebuild zlib.lib
137-
you need to clean up zlib-1.2.3\ by hand.
138-
When building zlib.pyd for Itanium, the pre-link build step won't work,
139-
so you will need to invoke nmake manually, using an IA64 build
140-
environment.
141-
142127
bz2
143128
Python wrapper for the libbz2 compression library. Homepage
144129
http://sources.redhat.com/bzip2/

‎PCbuild/zlib.vcproj‎

Lines changed: 0 additions & 245 deletions
This file was deleted.

0 commit comments

Comments
 (0)