diff --git a/PC/config.c b/PC/config.c
index 9ac69e348f1..962d9b908de 100644
--- a/PC/config.c
+++ b/PC/config.c
@@ -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},
diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln
index d75e7fbb4b2..8f998c3697c 100644
--- a/PCbuild/pcbuild.sln
+++ b/PCbuild/pcbuild.sln
@@ -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
diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index aceb7652dc8..15a37e51de0 100644
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -226,6 +226,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index d9591bd83ce..7ca818667c3 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -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/
diff --git a/PCbuild/zlib.vcproj b/PCbuild/zlib.vcproj
deleted file mode 100644
index 63e06ffa02d..00000000000
--- a/PCbuild/zlib.vcproj
+++ /dev/null
@@ -1,245 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 19e72dce0f3..839eb9d3756 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -103,7 +103,6 @@
'select.pyd',
'unicodedata.pyd',
'winsound.pyd',
- 'zlib.pyd',
'_elementtree.pyd',
'_bsddb.pyd',
'_socket.pyd',
@@ -112,15 +111,9 @@
'_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