summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2001-02-01 05:10:02 +0000
committerTim Peters <tim.peters@gmail.com>2001-02-01 05:10:02 +0000
commitca873eddd5e78b446a5ef1e9d8531e671aa6f17c (patch)
treea8e42f84ba57906b1d99c52046f4f5f6052459bf
parent0de88fc4b108751b86443852b6741680d704168f (diff)
downloadcpython-git-ca873eddd5e78b446a5ef1e9d8531e671aa6f17c.tar.gz
Windows build: update for 2.1a2, + get ucnhash out of the installer.
-rw-r--r--PCbuild/BUILDno.txt2
-rw-r--r--PCbuild/python20.wse16
-rw-r--r--PCbuild/pythoncore.dsp4
-rw-r--r--PCbuild/readme.txt2
4 files changed, 9 insertions, 15 deletions
diff --git a/PCbuild/BUILDno.txt b/PCbuild/BUILDno.txt
index cd93561889..34a9ffa2b1 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 3e0e7ab729..14269405ca 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
@@ -727,11 +727,6 @@ item: Install File
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
Flags=0000000000000010
@@ -797,11 +792,6 @@ item: Install File
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
Flags=0000000000000010
diff --git a/PCbuild/pythoncore.dsp b/PCbuild/pythoncore.dsp
index 49351867ea..256de83220 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 9cabf89c02..255a53b280 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