[Python-checkins] CVS: python/dist/src/PCbuild BUILDno.txt,1.5,1.6 python20.wse,1.23,1.24 pythoncore.dsp,1.2,1.3 readme.txt,1.16,1.17

[Tim Peters]

Update of /cvsroot/python/python/dist/src/PCbuild
In directory usw-pr-cvs1:/tmp/cvs-serv15723/python/dist/src/PCbuild

Modified Files:
	BUILDno.txt python20.wse pythoncore.dsp readme.txt 
Log Message:
Windows build:  update for 2.1a2, + get ucnhash out of the installer.


Index: BUILDno.txt
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/BUILDno.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** BUILDno.txt	2001/01/17 23:23:13	1.5
--- BUILDno.txt	2001/02/01 05:10:02	1.6
***************
*** 34,37 ****
--- 34,39 ----
  Windows Python BUILD numbers
  ----------------------------
+   10    2.1a2
+         1-Feb-2001
     9    2.1a1
          17-Jan-2001

Index: python20.wse
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/python20.wse,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** python20.wse	2001/01/17 23:23:13	1.23
--- python20.wse	2001/02/01 05:10:02	1.24
***************
*** 2,6 ****
  item: Global
    Version=5.0
!   Title=Python 2.1 alpha 1
    Flags=00010100
    Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--- 2,6 ----
  item: Global
    Version=5.0
!   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
***************
*** 65,69 ****
  item: Set Variable
    Variable=APPTITLE
!   Value=Python 2.1 alpha 1
  end
  item: Set Variable
--- 65,69 ----
  item: Set Variable
    Variable=APPTITLE
!   Value=Python 2.1 alpha 2
  end
  item: Set Variable
***************
*** 73,77 ****
  item: Set Variable
    Variable=PY_VERSION
!   Value=2.1a1
  end
  item: Set Variable
--- 73,77 ----
  item: Set Variable
    Variable=PY_VERSION
!   Value=2.1a2
  end
  item: Set Variable
***************
*** 728,736 ****
  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
--- 728,731 ----
***************
*** 795,803 ****
    Source=%_SRC_%\PCbuild\select.lib
    Destination=%MAINDIR%\libs\select.lib
-   Flags=0000000000000010
- end
- item: Install File
-   Source=%_SRC_%\PCbuild\ucnhash.lib
-   Destination=%MAINDIR%\libs\ucnhash.lib
    Flags=0000000000000010
  end
--- 790,793 ----

Index: pythoncore.dsp
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/pythoncore.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** pythoncore.dsp	2001/01/26 00:12:49	1.2
--- pythoncore.dsp	2001/02/01 05:10:02	1.3
***************
*** 710,718 ****
  !IF  "$(CFG)" == "pythoncore - Win32 Release"
  
! # ADD CPP /D BUILD=9
  
  !ELSEIF  "$(CFG)" == "pythoncore - Win32 Debug"
  
! # ADD CPP /D BUILD=9
  
  !ELSEIF  "$(CFG)" == "pythoncore - Win32 Alpha Debug"
--- 710,718 ----
  !IF  "$(CFG)" == "pythoncore - Win32 Release"
  
! # ADD CPP /D BUILD=10
  
  !ELSEIF  "$(CFG)" == "pythoncore - Win32 Debug"
  
! # ADD CPP /D BUILD=10
  
  !ELSEIF  "$(CFG)" == "pythoncore - Win32 Alpha Debug"

Index: readme.txt
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/readme.txt,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** readme.txt	2001/01/31 19:39:44	1.16
--- readme.txt	2001/02/01 05:10:02	1.17
***************
*** 92,95 ****
--- 92,97 ----
      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