Docs for new Windows zlib build procedure.

diff --git a/Misc/NEWS b/Misc/NEWS
index fa66952ce690f9bd559a510c1f2ccb45a89097ca..2b9bb6645aa6ac4517f3ce0a233cfe1cf7b4f2c6 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,7 +13,6 @@ Core language, builtins, and interpreter
 - Functions are now compared and hashed by identity, not by value, since
   the func_code attribute is writable.
 
-
 Standard library
 
 - random.py is now self-contained, and offers all the functionality of
@@ -26,6 +25,12 @@ Standard library
   each thread, then using .jumpahead() to force each instance to use a
   non-overlapping segment of the full period.
 
+Windows changes
+
+- Build procedure:  the zlib project is built in a different way that
+  ensures the zlib header files used can no longer get out of synch with
+  the zlib binary used.  See PCbuild\readme.txt for details.
+
 
 What's New in Python 2.1 alpha 1?
 =================================

diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
index ed00b5c18b1c7a69670ddb06d7dffb5ddeaa13f4..78bd130f200e54b1420d842cf3005af707a7f0c8 100644 (file)
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -1,14 +1,7 @@
 /* zlibmodule.c -- gzip-compatible data compression */
 /* See http://www.info-zip.org/pub/infozip/zlib/ */
 
-/* *** Notes for Windows Users ***
-   * Download the source distribution as referenced above.
-   * Unpack the distribution such that a "..\..\zlib-1.1.3" directory is created
-     relative to the "pcbuild" directory.
-   * Build this "zlib" project.  Via from MSVC magic, the correct zlib makefile will
-     be run, and "..\..\zlib-1.1.3\zlib.lib" will be built before zlib.pyd.
-   *** End of notes for Windows users ***
-*/
+/* Windows users:  read Python's PCbuild\readme.txt */
 
 
 #include "Python.h"

diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 0a79a88dbf8de768d112c679bce36897c5c3d703..9cabf89c02f51068c7676d399cf731708efef21c 100644 (file)
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -69,12 +69,17 @@ _tkinter
     Be sure to install everything, including the Tcl/Tk header files.
 
 zlib
-    Python wrapper for the zlib compression library.  Requires
-        http://www.winimage.com/zLibDll/zlib133dll.zip
-    and
-        ftp://ftp.uu.net/graphics/png/src/zlib133.zip
-    Unpack the former into dist\zlib113dll.
-    Uppack the latter into dist\zlib113.
+    NOTE: This procedure is new (& simpler, & safer) for 2.1a2.
+    Python wrapper for the zlib compression library.  Get the source code
+    for version 1.1.3 from a convenient mirror at:
+        http://www.info-zip.org/pub/infozip/zlib/
+    Unpack into dist\zlib-1.1.3.
+    A custom pre-link step in the zlib project settings should manage to
+    build zlib-1.1.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.1.3\ when you do a clean, so if you want to rebuild zlib.lib
+    you need to clean up zlib-1.1.3\ by hand.
 
 bsddb
     Python wrapper for the BSD database 1.85.  Requires db.1.85.win32.zip,