From ca873eddd5e78b446a5ef1e9d8531e671aa6f17c Mon Sep 17 00:00:00 2001
From: Tim Peters <tim.peters@gmail.com>
Date: Thu, 1 Feb 2001 05:10:02 +0000
Subject: [PATCH] Windows build:  update for 2.1a2, + get ucnhash out of the
 installer.

---
 PCbuild/BUILDno.txt    |  2 ++
 PCbuild/python20.wse   | 16 +++-------------
 PCbuild/pythoncore.dsp |  4 ++--
 PCbuild/readme.txt     |  2 ++
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/PCbuild/BUILDno.txt b/PCbuild/BUILDno.txt
index cd93561889c..34a9ffa2b18 100644
--- a/PCbuild/BUILDno.txt
+++ b/PCbuild/BUILDno.txt
@@ -33,6 +33,8 @@ How to change the Windows build number:
 
 Windows Python BUILD numbers
 ----------------------------
+  10    2.1a2
+        1-Feb-2001
    9    2.1a1
         17-Jan-2001
    8    2.0 (final)
diff --git a/PCbuild/python20.wse b/PCbuild/python20.wse
index 3e0e7ab729a..14269405ca0 100644
--- a/PCbuild/python20.wse
+++ b/PCbuild/python20.wse
@@ -1,7 +1,7 @@
 Document Type: WSE
 item: Global
   Version=5.0
-  Title=Python 2.1 alpha 1
+  Title=Python 2.1 alpha 2
   Flags=00010100
   Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
   Japanese Font Name=MS Gothic
@@ -64,7 +64,7 @@ item: End Block
 end
 item: Set Variable
   Variable=APPTITLE
-  Value=Python 2.1 alpha 1
+  Value=Python 2.1 alpha 2
 end
 item: Set Variable
   Variable=GROUP
@@ -72,7 +72,7 @@ item: Set Variable
 end
 item: Set Variable
   Variable=PY_VERSION
-  Value=2.1a1
+  Value=2.1a2
 end
 item: Set Variable
   Variable=MAINDIR
@@ -726,11 +726,6 @@ item: Install File
   Destination=%MAINDIR%\DLLs\select.pyd
   Flags=0000000000000010
 end
-item: Install File
-  Source=%_SRC_%\PCbuild\ucnhash.pyd
-  Destination=%MAINDIR%\DLLs\ucnhash.pyd
-  Flags=0000000000000010
-end
 item: Install File
   Source=%_SRC_%\PCbuild\unicodedata.pyd
   Destination=%MAINDIR%\DLLs\unicodedata.pyd
@@ -796,11 +791,6 @@ item: Install File
   Destination=%MAINDIR%\libs\select.lib
   Flags=0000000000000010
 end
-item: Install File
-  Source=%_SRC_%\PCbuild\ucnhash.lib
-  Destination=%MAINDIR%\libs\ucnhash.lib
-  Flags=0000000000000010
-end
 item: Install File
   Source=%_SRC_%\PCbuild\unicodedata.lib
   Destination=%MAINDIR%\libs\unicodedata.lib
diff --git a/PCbuild/pythoncore.dsp b/PCbuild/pythoncore.dsp
index 49351867ea1..256de83220c 100644
--- a/PCbuild/pythoncore.dsp
+++ b/PCbuild/pythoncore.dsp
@@ -709,11 +709,11 @@ SOURCE=..\Modules\getbuildinfo.c
 
 !IF  "$(CFG)" == "pythoncore - Win32 Release"
 
-# ADD CPP /D BUILD=9
+# ADD CPP /D BUILD=10
 
 !ELSEIF  "$(CFG)" == "pythoncore - Win32 Debug"
 
-# ADD CPP /D BUILD=9
+# ADD CPP /D BUILD=10
 
 !ELSEIF  "$(CFG)" == "pythoncore - Win32 Alpha Debug"
 
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 9cabf89c02f..255a53b2807 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -91,6 +91,8 @@ bsddb
     This builds bsddb\Port\win32\db.lib, which the MSVC project links in.
     Note that if you're running Win9X, you'll need to run vcvars32.bat
     before running nmake (this batch file is in your MSVC installation).
+    TODO:  make this work like zlib (in particular, MSVC runs the prelink
+    step in an enviroment that already has the correct envars set up).
 
 pyexpat
     Python wrapper for accelerated XML parsing.  Requires