Windows build: update for 2.1a2, + get ucnhash out of the installer.

This commit is contained in:
Tim Peters 2001-02-01 05:10:02 +00:00
parent 0de88fc4b1
commit ca873eddd5
4 changed files with 9 additions and 15 deletions

View File

@ -33,6 +33,8 @@ How to change the Windows build number:
Windows Python BUILD numbers Windows Python BUILD numbers
---------------------------- ----------------------------
10 2.1a2
1-Feb-2001
9 2.1a1 9 2.1a1
17-Jan-2001 17-Jan-2001
8 2.0 (final) 8 2.0 (final)

View File

@ -1,7 +1,7 @@
Document Type: WSE Document Type: WSE
item: Global item: Global
Version=5.0 Version=5.0
Title=Python 2.1 alpha 1 Title=Python 2.1 alpha 2
Flags=00010100 Flags=00010100
Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Japanese Font Name=MS Gothic Japanese Font Name=MS Gothic
@ -64,7 +64,7 @@ item: End Block
end end
item: Set Variable item: Set Variable
Variable=APPTITLE Variable=APPTITLE
Value=Python 2.1 alpha 1 Value=Python 2.1 alpha 2
end end
item: Set Variable item: Set Variable
Variable=GROUP Variable=GROUP
@ -72,7 +72,7 @@ item: Set Variable
end end
item: Set Variable item: Set Variable
Variable=PY_VERSION Variable=PY_VERSION
Value=2.1a1 Value=2.1a2
end end
item: Set Variable item: Set Variable
Variable=MAINDIR Variable=MAINDIR
@ -726,11 +726,6 @@ item: Install File
Destination=%MAINDIR%\DLLs\select.pyd Destination=%MAINDIR%\DLLs\select.pyd
Flags=0000000000000010 Flags=0000000000000010
end end
item: Install File
Source=%_SRC_%\PCbuild\ucnhash.pyd
Destination=%MAINDIR%\DLLs\ucnhash.pyd
Flags=0000000000000010
end
item: Install File item: Install File
Source=%_SRC_%\PCbuild\unicodedata.pyd Source=%_SRC_%\PCbuild\unicodedata.pyd
Destination=%MAINDIR%\DLLs\unicodedata.pyd Destination=%MAINDIR%\DLLs\unicodedata.pyd
@ -796,11 +791,6 @@ item: Install File
Destination=%MAINDIR%\libs\select.lib Destination=%MAINDIR%\libs\select.lib
Flags=0000000000000010 Flags=0000000000000010
end end
item: Install File
Source=%_SRC_%\PCbuild\ucnhash.lib
Destination=%MAINDIR%\libs\ucnhash.lib
Flags=0000000000000010
end
item: Install File item: Install File
Source=%_SRC_%\PCbuild\unicodedata.lib Source=%_SRC_%\PCbuild\unicodedata.lib
Destination=%MAINDIR%\libs\unicodedata.lib Destination=%MAINDIR%\libs\unicodedata.lib

View File

@ -709,11 +709,11 @@ SOURCE=..\Modules\getbuildinfo.c
!IF "$(CFG)" == "pythoncore - Win32 Release" !IF "$(CFG)" == "pythoncore - Win32 Release"
# ADD CPP /D BUILD=9 # ADD CPP /D BUILD=10
!ELSEIF "$(CFG)" == "pythoncore - Win32 Debug" !ELSEIF "$(CFG)" == "pythoncore - Win32 Debug"
# ADD CPP /D BUILD=9 # ADD CPP /D BUILD=10
!ELSEIF "$(CFG)" == "pythoncore - Win32 Alpha Debug" !ELSEIF "$(CFG)" == "pythoncore - Win32 Alpha Debug"

View File

@ -91,6 +91,8 @@ bsddb
This builds bsddb\Port\win32\db.lib, which the MSVC project links in. 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 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). 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 pyexpat
Python wrapper for accelerated XML parsing. Requires Python wrapper for accelerated XML parsing. Requires