[Python-checkins] CVS: python/dist/src/PCbuild BUILDno.txt,1.12.2.2,1.12.2.3 python20.wse,1.40.2.1,1.40.2.2 pythoncore.dsp,1.15.2.4,1.15.2.5

[Tim Peters]

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

Modified Files:
      Tag: descr-branch
	BUILDno.txt python20.wse pythoncore.dsp 
Log Message:
Last trunk->branch merge for today <ahem>.


Index: BUILDno.txt
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/BUILDno.txt,v
retrieving revision 1.12.2.2
retrieving revision 1.12.2.3
diff -C2 -r1.12.2.2 -r1.12.2.3
*** BUILDno.txt	2001/07/15 20:26:56	1.12.2.2
--- BUILDno.txt	2001/07/17 04:19:05	1.12.2.3
***************
*** 34,37 ****
--- 34,39 ----
  Windows Python BUILD numbers
  ----------------------------
+   21    2.2a1       TENTATIVE
+         18-Jul-2001
    20    2.1.1       TENTATIVE
          20-Jul-2001

Index: python20.wse
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/python20.wse,v
retrieving revision 1.40.2.1
retrieving revision 1.40.2.2
diff -C2 -r1.40.2.1 -r1.40.2.2
*** python20.wse	2001/07/14 07:47:35	1.40.2.1
--- python20.wse	2001/07/17 04:19:05	1.40.2.2
***************
*** 2,6 ****
  item: Global
    Version=5.0
!   Title=Python 2.2 pre-alpha
    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.2 alpha 1
    Flags=00010100
    Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
***************
*** 17,20 ****
--- 17,21 ----
    Patch Threshold=85
    Patch Memory=4000
+   EXE Filename=Python-2.2a1.exe
    Variable Name1=_SYS_
    Variable Description1=System directory (where to find MSVCRT.DLL)
***************
*** 67,71 ****
  item: Set Variable
    Variable=APPTITLE
!   Value=Python 2.2 pre-alpha
  end
  item: Set Variable
--- 68,72 ----
  item: Set Variable
    Variable=APPTITLE
!   Value=Python 2.2a1
  end
  item: Set Variable

Index: pythoncore.dsp
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/pythoncore.dsp,v
retrieving revision 1.15.2.4
retrieving revision 1.15.2.5
diff -C2 -r1.15.2.4 -r1.15.2.5
*** pythoncore.dsp	2001/07/06 18:53:48	1.15.2.4
--- pythoncore.dsp	2001/07/17 04:19:05	1.15.2.5
***************
*** 496,514 ****
  # Begin Source File
  
- SOURCE=..\Objects\descrobject.c
- 
- !IF  "$(CFG)" == "pythoncore - Win32 Release"
- 
- !ELSEIF  "$(CFG)" == "pythoncore - Win32 Debug"
- 
- !ELSEIF  "$(CFG)" == "pythoncore - Win32 Alpha Debug"
- 
- !ELSEIF  "$(CFG)" == "pythoncore - Win32 Alpha Release"
- 
- !ENDIF 
- 
- # End Source File
- # Begin Source File
- 
  SOURCE=..\Objects\dictobject.c
  
--- 496,499 ----
***************
*** 725,733 ****
  !IF  "$(CFG)" == "pythoncore - Win32 Release"
  
! # ADD CPP /D BUILD=16
  
  !ELSEIF  "$(CFG)" == "pythoncore - Win32 Debug"
  
! # ADD CPP /D BUILD=16
  
  !ELSEIF  "$(CFG)" == "pythoncore - Win32 Alpha Debug"
--- 710,718 ----
  !IF  "$(CFG)" == "pythoncore - Win32 Release"
  
! # ADD CPP /D BUILD=21
  
  !ELSEIF  "$(CFG)" == "pythoncore - Win32 Debug"
  
! # ADD CPP /D BUILD=21
  
  !ELSEIF  "$(CFG)" == "pythoncore - Win32 Alpha Debug"
***************
*** 1724,1742 ****
  
  SOURCE=..\Modules\xreadlinesmodule.c
- 
- !IF  "$(CFG)" == "pythoncore - Win32 Release"
- 
- !ELSEIF  "$(CFG)" == "pythoncore - Win32 Debug"
- 
- !ELSEIF  "$(CFG)" == "pythoncore - Win32 Alpha Debug"
- 
- !ELSEIF  "$(CFG)" == "pythoncore - Win32 Alpha Release"
- 
- !ENDIF 
- 
- # End Source File
- # Begin Source File
- 
- SOURCE=..\Modules\xxsubtype.c
  
  !IF  "$(CFG)" == "pythoncore - Win32 Release"
--- 1709,1712 ----