[Python-checkins] CVS: python/dist/src/PCbuild _tkinter.dsp,1.9,1.10 parser.dsp,1.5,1.6 python.dsp,1.7,1.8 python15.dsp,1.10,1.11 pythonw.dsp,1.6,1.7 zlib.dsp,1.7,1.8

Guido van Rossum guido@cnri.reston.va.us
Thu, 3 Feb 2000 12:19:38 -0500 (EST)


Update of /projects/cvsroot/python/dist/src/PCbuild
In directory eric:/projects/python/develop/guido/src/PCbuild

Modified Files:
	_tkinter.dsp parser.dsp python.dsp python15.dsp pythonw.dsp 
	zlib.dsp 
Log Message:
Mark Hammond renames the x86 projects back to what they were named
before the patch by Trent Mick.  Since he now also works for
ActiveState, I suppose he overrides Trent. :-)


Index: _tkinter.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/_tkinter.dsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** _tkinter.dsp	2000/01/21 00:03:42	1.9
--- _tkinter.dsp	2000/02/03 17:19:35	1.10
***************
*** 21,26 ****
  !MESSAGE "_tkinter - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
  !MESSAGE "_tkinter - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
! !MESSAGE "_tkinter - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "_tkinter - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE 
  
--- 21,26 ----
  !MESSAGE "_tkinter - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
  !MESSAGE "_tkinter - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
! !MESSAGE "_tkinter - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "_tkinter - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE 
  
***************
*** 30,34 ****
  # PROP Scc_LocalPath "..\..\.."
  
! !IF  "$(CFG)" == "_tkinter - Win32 x86 Release"
  
  # PROP BASE Use_MFC 0
--- 30,34 ----
  # PROP Scc_LocalPath "..\..\.."
  
! !IF  "$(CFG)" == "_tkinter - Win32 Release"
  
  # PROP BASE Use_MFC 0
***************
*** 61,65 ****
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 x86 Debug"
  
  # PROP BASE Use_MFC 0
--- 61,65 ----
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 Debug"
  
  # PROP BASE Use_MFC 0
***************
*** 160,165 ****
  # Begin Target
  
! # Name "_tkinter - Win32 x86 Release"
! # Name "_tkinter - Win32 x86 Debug"
  # Name "_tkinter - Win32 Alpha Debug"
  # Name "_tkinter - Win32 Alpha Release"
--- 160,165 ----
  # Begin Target
  
! # Name "_tkinter - Win32 Release"
! # Name "_tkinter - Win32 Debug"
  # Name "_tkinter - Win32 Alpha Debug"
  # Name "_tkinter - Win32 Alpha Release"
***************
*** 168,174 ****
  SOURCE=..\Modules\_tkinter.c
  
! !IF  "$(CFG)" == "_tkinter - Win32 x86 Release"
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 x86 Debug"
  
  !ELSEIF  "$(CFG)" == "_tkinter - Win32 Alpha Debug"
--- 168,174 ----
  SOURCE=..\Modules\_tkinter.c
  
! !IF  "$(CFG)" == "_tkinter - Win32 Release"
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 Debug"
  
  !ELSEIF  "$(CFG)" == "_tkinter - Win32 Alpha Debug"
***************
*** 183,189 ****
  SOURCE=..\Modules\tkappinit.c
  
! !IF  "$(CFG)" == "_tkinter - Win32 x86 Release"
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 x86 Debug"
  
  !ELSEIF  "$(CFG)" == "_tkinter - Win32 Alpha Debug"
--- 183,189 ----
  SOURCE=..\Modules\tkappinit.c
  
! !IF  "$(CFG)" == "_tkinter - Win32 Release"
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 Debug"
  
  !ELSEIF  "$(CFG)" == "_tkinter - Win32 Alpha Debug"

Index: parser.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/parser.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** parser.dsp	2000/01/20 21:31:41	1.5
--- parser.dsp	2000/02/03 17:19:35	1.6
***************
*** 19,24 ****
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "parser - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "parser - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "parser - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
  !MESSAGE "parser - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
--- 19,24 ----
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "parser - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "parser - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "parser - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
  !MESSAGE "parser - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
***************
*** 30,34 ****
  # PROP Scc_LocalPath ".."
  
! !IF  "$(CFG)" == "parser - Win32 x86 Release"
  
  # PROP BASE Use_MFC 0
--- 30,34 ----
  # PROP Scc_LocalPath ".."
  
! !IF  "$(CFG)" == "parser - Win32 Release"
  
  # PROP BASE Use_MFC 0
***************
*** 61,65 ****
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "parser - Win32 x86 Debug"
  
  # PROP BASE Use_MFC 0
--- 61,65 ----
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "parser - Win32 Debug"
  
  # PROP BASE Use_MFC 0
***************
*** 160,165 ****
  # Begin Target
  
! # Name "parser - Win32 x86 Release"
! # Name "parser - Win32 x86 Debug"
  # Name "parser - Win32 Alpha Debug"
  # Name "parser - Win32 Alpha Release"
--- 160,165 ----
  # Begin Target
  
! # Name "parser - Win32 Release"
! # Name "parser - Win32 Debug"
  # Name "parser - Win32 Alpha Debug"
  # Name "parser - Win32 Alpha Release"
***************
*** 168,174 ****
  SOURCE=..\Modules\parsermodule.c
  
! !IF  "$(CFG)" == "parser - Win32 x86 Release"
  
! !ELSEIF  "$(CFG)" == "parser - Win32 x86 Debug"
  
  !ELSEIF  "$(CFG)" == "parser - Win32 Alpha Debug"
--- 168,174 ----
  SOURCE=..\Modules\parsermodule.c
  
! !IF  "$(CFG)" == "parser - Win32 Release"
  
! !ELSEIF  "$(CFG)" == "parser - Win32 Debug"
  
  !ELSEIF  "$(CFG)" == "parser - Win32 Alpha Debug"

Index: python.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/python.dsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** python.dsp	2000/01/20 21:31:41	1.7
--- python.dsp	2000/02/03 17:19:35	1.8
***************
*** 19,24 ****
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "python - Win32 x86 Release" (based on "Win32 (x86) Console Application")
! !MESSAGE "python - Win32 x86 Debug" (based on "Win32 (x86) Console Application")
  !MESSAGE "python - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
  !MESSAGE "python - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application")
--- 19,24 ----
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "python - Win32 Release" (based on "Win32 (x86) Console Application")
! !MESSAGE "python - Win32 Debug" (based on "Win32 (x86) Console Application")
  !MESSAGE "python - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
  !MESSAGE "python - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application")
***************
*** 30,34 ****
  # PROP Scc_LocalPath ".."
  
! !IF  "$(CFG)" == "python - Win32 x86 Release"
  
  # PROP BASE Use_MFC 0
--- 30,34 ----
  # PROP Scc_LocalPath ".."
  
! !IF  "$(CFG)" == "python - Win32 Release"
  
  # PROP BASE Use_MFC 0
***************
*** 56,60 ****
  # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"Release"
  
! !ELSEIF  "$(CFG)" == "python - Win32 x86 Debug"
  
  # PROP BASE Use_MFC 0
--- 56,60 ----
  # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"Release"
  
! !ELSEIF  "$(CFG)" == "python - Win32 Debug"
  
  # PROP BASE Use_MFC 0
***************
*** 140,145 ****
  # Begin Target
  
! # Name "python - Win32 x86 Release"
! # Name "python - Win32 x86 Debug"
  # Name "python - Win32 Alpha Debug"
  # Name "python - Win32 Alpha Release"
--- 140,145 ----
  # Begin Target
  
! # Name "python - Win32 Release"
! # Name "python - Win32 Debug"
  # Name "python - Win32 Alpha Debug"
  # Name "python - Win32 Alpha Release"
***************
*** 152,158 ****
  SOURCE=..\Modules\python.c
  
! !IF  "$(CFG)" == "python - Win32 x86 Release"
  
! !ELSEIF  "$(CFG)" == "python - Win32 x86 Debug"
  
  !ELSEIF  "$(CFG)" == "python - Win32 Alpha Debug"
--- 152,158 ----
  SOURCE=..\Modules\python.c
  
! !IF  "$(CFG)" == "python - Win32 Release"
  
! !ELSEIF  "$(CFG)" == "python - Win32 Debug"
  
  !ELSEIF  "$(CFG)" == "python - Win32 Alpha Debug"

Index: python15.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/python15.dsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** python15.dsp	2000/01/20 21:31:41	1.10
--- python15.dsp	2000/02/03 17:19:35	1.11
***************
*** 19,24 ****
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "python15 - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "python15 - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "python15 - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
  !MESSAGE "python15 - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
--- 19,24 ----
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "python15 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
[...1694 lines suppressed...]
! !ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
  
  !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
***************
*** 1637,1643 ****
  SOURCE=..\Modules\yuvconvert.c
  
! !IF  "$(CFG)" == "python15 - Win32 x86 Release"
  
! !ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
  
  !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
--- 1637,1643 ----
  SOURCE=..\Modules\yuvconvert.c
  
! !IF  "$(CFG)" == "python15 - Win32 Release"
  
! !ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
  
  !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"

Index: pythonw.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/pythonw.dsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** pythonw.dsp	2000/01/20 21:31:41	1.6
--- pythonw.dsp	2000/02/03 17:19:35	1.7
***************
*** 19,24 ****
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "pythonw - Win32 x86 Release" (based on "Win32 (x86) Application")
! !MESSAGE "pythonw - Win32 x86 Debug" (based on "Win32 (x86) Application")
  !MESSAGE "pythonw - Win32 Alpha Debug" (based on "Win32 (ALPHA) Application")
  !MESSAGE "pythonw - Win32 Alpha Release" (based on "Win32 (ALPHA) Application")
--- 19,24 ----
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "pythonw - Win32 Release" (based on "Win32 (x86) Application")
! !MESSAGE "pythonw - Win32 Debug" (based on "Win32 (x86) Application")
  !MESSAGE "pythonw - Win32 Alpha Debug" (based on "Win32 (ALPHA) Application")
  !MESSAGE "pythonw - Win32 Alpha Release" (based on "Win32 (ALPHA) Application")
***************
*** 30,34 ****
  # PROP Scc_LocalPath "..\pc"
  
! !IF  "$(CFG)" == "pythonw - Win32 x86 Release"
  
  # PROP BASE Use_MFC 0
--- 30,34 ----
  # PROP Scc_LocalPath "..\pc"
  
! !IF  "$(CFG)" == "pythonw - Win32 Release"
  
  # PROP BASE Use_MFC 0
***************
*** 60,64 ****
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "pythonw - Win32 x86 Debug"
  
  # PROP BASE Use_MFC 0
--- 60,64 ----
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "pythonw - Win32 Debug"
  
  # PROP BASE Use_MFC 0
***************
*** 158,163 ****
  # Begin Target
  
! # Name "pythonw - Win32 x86 Release"
! # Name "pythonw - Win32 x86 Debug"
  # Name "pythonw - Win32 Alpha Debug"
  # Name "pythonw - Win32 Alpha Release"
--- 158,163 ----
  # Begin Target
  
! # Name "pythonw - Win32 Release"
! # Name "pythonw - Win32 Debug"
  # Name "pythonw - Win32 Alpha Debug"
  # Name "pythonw - Win32 Alpha Release"
***************
*** 170,176 ****
  SOURCE=..\PC\WinMain.c
  
! !IF  "$(CFG)" == "pythonw - Win32 x86 Release"
  
! !ELSEIF  "$(CFG)" == "pythonw - Win32 x86 Debug"
  
  !ELSEIF  "$(CFG)" == "pythonw - Win32 Alpha Debug"
--- 170,176 ----
  SOURCE=..\PC\WinMain.c
  
! !IF  "$(CFG)" == "pythonw - Win32 Release"
  
! !ELSEIF  "$(CFG)" == "pythonw - Win32 Debug"
  
  !ELSEIF  "$(CFG)" == "pythonw - Win32 Alpha Debug"

Index: zlib.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/zlib.dsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** zlib.dsp	2000/01/20 21:31:41	1.7
--- zlib.dsp	2000/02/03 17:19:35	1.8
***************
*** 5,9 ****
  # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  
! CFG=zlib - Win32 x86 Debug
  !MESSAGE This is not a valid makefile. To build this project using NMAKE,
  !MESSAGE use the Export Makefile command and run
--- 5,9 ----
  # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  
! CFG=zlib - Win32 Debug
  !MESSAGE This is not a valid makefile. To build this project using NMAKE,
  !MESSAGE use the Export Makefile command and run
***************
*** 14,23 ****
  !MESSAGE by defining the macro CFG on the command line. For example:
  !MESSAGE 
! !MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 x86 Debug"
  !MESSAGE 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "zlib - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "zlib - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE 
  
--- 14,23 ----
  !MESSAGE by defining the macro CFG on the command line. For example:
  !MESSAGE 
! !MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 Debug"
  !MESSAGE 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "zlib - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "zlib - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE 
  
***************
*** 30,34 ****
  RSC=rc.exe
  
! !IF  "$(CFG)" == "zlib - Win32 x86 Release"
  
  # PROP BASE Use_MFC 0
--- 30,34 ----
  RSC=rc.exe
  
! !IF  "$(CFG)" == "zlib - Win32 Release"
  
  # PROP BASE Use_MFC 0
***************
*** 58,62 ****
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "zlib - Win32 x86 Debug"
  
  # PROP BASE Use_MFC 0
--- 58,62 ----
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "zlib - Win32 Debug"
  
  # PROP BASE Use_MFC 0
***************
*** 90,95 ****
  # Begin Target
  
! # Name "zlib - Win32 x86 Release"
! # Name "zlib - Win32 x86 Debug"
  # Begin Source File
  
--- 90,95 ----
  # Begin Target
  
! # Name "zlib - Win32 Release"
! # Name "zlib - Win32 Debug"
  # Begin Source File