[Python-checkins] CVS: python/dist/src/PCbuild python16.dsp,NONE,1.1 python16.wse,NONE,1.1 _tkinter.dsp,1.10,1.11 bsddb.dsp,1.7,1.8 parser.dsp,1.6,1.7 pcbuild.dsw,1.7,1.8 python.dsp,1.8,1.9

Guido van Rossum python-dev@python.org
Tue, 28 Mar 2000 20:54:27 -0500 (EST)


Update of /projects/cvsroot/python/dist/src/PCbuild
In directory eric:/home/guido/hp/mal/py-patched/PCbuild

Modified Files:
	_tkinter.dsp bsddb.dsp parser.dsp pcbuild.dsw python.dsp 
Added Files:
	python16.dsp python16.wse 
Log Message:
Update for creating and linking with python16.dll.
Also, _tkinter is linked with Tcl 8.3.



Index: _tkinter.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/_tkinter.dsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** _tkinter.dsp	2000/02/03 17:19:35	1.10
--- _tkinter.dsp	2000/03/29 01:54:24	1.11
***************
*** 30,96 ****
  # PROP Scc_LocalPath "..\..\.."
  
! !IF  "$(CFG)" == "_tkinter - Win32 Release"
  
  # PROP BASE Use_MFC 0
! # PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "Release"
! # PROP BASE Intermediate_Dir "Release"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
! # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "."
! # PROP Intermediate_Dir "x86-temp-release"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
- F90=df.exe
  CPP=cl.exe
! # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
! # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c
  MTL=midl.exe
! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
  RSC=rc.exe
! # ADD BASE RSC /l 0x409 /d "NDEBUG"
! # ADD RSC /l 0x409 /d "NDEBUG"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE 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:windows /dll /machine:I386
! # ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib tcl80.lib tk80.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:I386 /out:"./_tkinter.pyd" /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 Debug"
  
  # PROP BASE Use_MFC 0
! # PROP BASE Use_Debug_Libraries 1
! # PROP BASE Output_Dir "Debug"
! # PROP BASE Intermediate_Dir "Debug"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
! # PROP Use_Debug_Libraries 1
  # PROP Output_Dir "."
! # PROP Intermediate_Dir "x86-temp-debug"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
- F90=df.exe
  CPP=cl.exe
! # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
! # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c
  MTL=midl.exe
! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
  RSC=rc.exe
! # ADD BASE RSC /l 0x409 /d "_DEBUG"
! # ADD RSC /l 0x409 /d "_DEBUG"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE 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:windows /dll /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib tcl80.lib tk80.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:I386 /out:"./_tkinter_d.pyd" /pdbtype:sept /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 Alpha Debug"
  
  # PROP BASE Use_MFC 0
--- 30,98 ----
  # PROP Scc_LocalPath "..\..\.."
  
! !IF  "$(CFG)" == "_tkinter - Win32 Alpha Debug"
  
  # PROP BASE Use_MFC 0
! # PROP BASE Use_Debug_Libraries 1
! # PROP BASE Output_Dir "Debug"
! # PROP BASE Intermediate_Dir "Debug"
! # PROP BASE Ignore_Export_Lib 0
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
! # PROP Use_Debug_Libraries 1
  # PROP Output_Dir "."
! # PROP Intermediate_Dir "alpha-temp-debug"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  CPP=cl.exe
! # ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c
! # ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c
  MTL=midl.exe
! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
  RSC=rc.exe
! # ADD BASE RSC /l 0x409 /d "_DEBUG"
! # ADD RSC /l 0x409 /d "_DEBUG"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 tcl80.lib tk80.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:ALPHA /out:"./_tkinter_d.pyd" /pdbtype:sept /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter
! # SUBTRACT BASE LINK32 /pdb:none
! # ADD LINK32 ..\..\tcl\lib\tcl83.lib ..\..\tcl\lib\tk83.lib user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-debug/_tkinter_d.pyd" /pdbtype:sept /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 Alpha Release"
  
  # PROP BASE Use_MFC 0
! # PROP BASE Use_Debug_Libraries 0
! # PROP BASE Output_Dir "Release"
! # PROP BASE Intermediate_Dir "Release"
! # PROP BASE Ignore_Export_Lib 0
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
! # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "."
! # PROP Intermediate_Dir "alpha-temp-release"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  CPP=cl.exe
! # ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c
! # ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\Include" /I "..\PC" /I "..\..\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c
  MTL=midl.exe
! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
  RSC=rc.exe
! # ADD BASE RSC /l 0x409 /d "NDEBUG"
! # ADD RSC /l 0x409 /d "NDEBUG"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 tcl80.lib tk80.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:ALPHA /out:"./_tkinter.pyd" /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter
! # SUBTRACT BASE LINK32 /pdb:none
! # ADD LINK32 ..\..\tcl\lib\tcl83.lib ..\..\tcl\lib\tk83.lib user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-release/_tkinter.pyd" /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 Debug"
  
  # PROP BASE Use_MFC 0
***************
*** 98,115 ****
  # PROP BASE Output_Dir "Debug"
  # PROP BASE Intermediate_Dir "Debug"
- # PROP BASE Ignore_Export_Lib 0
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 1
  # PROP Output_Dir "."
! # PROP Intermediate_Dir "alpha-temp-debug"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  MTL=midl.exe
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
- CPP=cl.exe
- # ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c
- # ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c
  RSC=rc.exe
  # ADD BASE RSC /l 0x409 /d "_DEBUG"
--- 100,117 ----
  # PROP BASE Output_Dir "Debug"
  # PROP BASE Intermediate_Dir "Debug"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 1
  # PROP Output_Dir "."
! # PROP Intermediate_Dir "x86-temp-debug"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
+ F90=df.exe
+ CPP=cl.exe
+ # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+ # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "C:\Program Files\Tcl\include" /I "..\Include" /I "..\PC" /I "..\..\tcl8.3\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c
  MTL=midl.exe
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
  RSC=rc.exe
  # ADD BASE RSC /l 0x409 /d "_DEBUG"
***************
*** 119,128 ****
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 tcl80.lib tk80.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:ALPHA /out:"./_tkinter_d.pyd" /pdbtype:sept /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter
! # SUBTRACT BASE LINK32 /pdb:none
! # ADD LINK32 tcl80.lib tk80.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-debug/_tkinter_d.pyd" /pdbtype:sept /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 Alpha Release"
  
  # PROP BASE Use_MFC 0
--- 121,129 ----
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE 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:windows /dll /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 ..\..\tcl8.3\lib\tk83.lib ..\..\tcl8.3\lib\tcl83.lib odbc32.lib odbccp32.lib user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:I386 /out:"./_tkinter_d.pyd" /pdbtype:sept /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 Release"
  
  # PROP BASE Use_MFC 0
***************
*** 130,147 ****
  # PROP BASE Output_Dir "Release"
  # PROP BASE Intermediate_Dir "Release"
- # PROP BASE Ignore_Export_Lib 0
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "."
! # PROP Intermediate_Dir "alpha-temp-release"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  MTL=midl.exe
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
- CPP=cl.exe
- # ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c
- # ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\Include" /I "..\PC" /I "..\..\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c
  RSC=rc.exe
  # ADD BASE RSC /l 0x409 /d "NDEBUG"
--- 131,148 ----
  # PROP BASE Output_Dir "Release"
  # PROP BASE Intermediate_Dir "Release"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "."
! # PROP Intermediate_Dir "x86-temp-release"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
+ F90=df.exe
+ CPP=cl.exe
+ # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+ # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\tcl\include" /I "..\Include" /I "..\PC" /I "..\..\tcl8.3\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c
  MTL=midl.exe
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
  RSC=rc.exe
  # ADD BASE RSC /l 0x409 /d "NDEBUG"
***************
*** 151,157 ****
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 tcl80.lib tk80.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:ALPHA /out:"./_tkinter.pyd" /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter
! # SUBTRACT BASE LINK32 /pdb:none
! # ADD LINK32 ..\..\tcl\lib\tcl82.lib ..\..\tcl\lib\tk82.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-release/_tkinter.pyd" /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter
  # SUBTRACT LINK32 /pdb:none
  
--- 152,157 ----
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE 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:windows /dll /machine:I386
! # ADD LINK32 ..\..\tcl8.3\lib\tk83.lib ..\..\tcl8.3\lib\tcl83.lib odbc32.lib odbccp32.lib user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:I386 /out:"./_tkinter.pyd" /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter
  # SUBTRACT LINK32 /pdb:none
  
***************
*** 160,179 ****
  # Begin Target
  
- # Name "_tkinter - Win32 Release"
- # Name "_tkinter - Win32 Debug"
  # Name "_tkinter - Win32 Alpha Debug"
  # Name "_tkinter - Win32 Alpha Release"
  # Begin Source File
  
  SOURCE=..\Modules\_tkinter.c
  
! !IF  "$(CFG)" == "_tkinter - Win32 Release"
  
  !ELSEIF  "$(CFG)" == "_tkinter - Win32 Debug"
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 Alpha Debug"
  
- !ELSEIF  "$(CFG)" == "_tkinter - Win32 Alpha Release"
- 
  !ENDIF 
  
--- 160,179 ----
  # Begin Target
  
  # Name "_tkinter - Win32 Alpha Debug"
  # Name "_tkinter - Win32 Alpha Release"
+ # Name "_tkinter - Win32 Debug"
+ # Name "_tkinter - Win32 Release"
  # Begin Source File
  
  SOURCE=..\Modules\_tkinter.c
  
! !IF  "$(CFG)" == "_tkinter - Win32 Alpha Debug"
  
+ !ELSEIF  "$(CFG)" == "_tkinter - Win32 Alpha Release"
+ 
  !ELSEIF  "$(CFG)" == "_tkinter - Win32 Debug"
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 Release"
  
  !ENDIF 
  
***************
*** 183,193 ****
  SOURCE=..\Modules\tkappinit.c
  
! !IF  "$(CFG)" == "_tkinter - Win32 Release"
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 Debug"
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 Alpha Debug"
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 Alpha Release"
  
  !ENDIF 
--- 183,193 ----
  SOURCE=..\Modules\tkappinit.c
  
! !IF  "$(CFG)" == "_tkinter - Win32 Alpha Debug"
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 Alpha Release"
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 Debug"
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 Release"
  
  !ENDIF 

Index: bsddb.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/bsddb.dsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** bsddb.dsp	2000/02/07 15:29:43	1.7
--- bsddb.dsp	2000/03/29 01:54:24	1.8
***************
*** 59,63 ****
  # ADD BASE 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:windows /dll /machine:I386
  # ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\bsddb\port\win32\db.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"./bsddb.pyd" /libpath:"Release" /export:initbsddb
! # SUBTRACT LINK32 /pdb:none
  
  !ELSEIF  "$(CFG)" == "bsddb - Win32 Debug"
--- 59,63 ----
  # ADD BASE 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:windows /dll /machine:I386
  # ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\bsddb\port\win32\db.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"./bsddb.pyd" /libpath:"Release" /export:initbsddb
! # SUBTRACT LINK32 /verbose /pdb:none
  
  !ELSEIF  "$(CFG)" == "bsddb - Win32 Debug"
***************
*** 90,94 ****
  # ADD BASE 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:windows /dll /debug /machine:I386 /pdbtype:sept
  # ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\bsddb\port\win32\db.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"MSVCRT" /out:"./bsddb_d.pyd" /pdbtype:sept /libpath:"Debug" /export:initbsddb
! # SUBTRACT LINK32 /pdb:none
  
  !ELSEIF  "$(CFG)" == "bsddb - Win32 Alpha Debug"
--- 90,94 ----
  # ADD BASE 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:windows /dll /debug /machine:I386 /pdbtype:sept
  # ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\bsddb\port\win32\db.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"MSVCRT" /out:"./bsddb_d.pyd" /pdbtype:sept /libpath:"Debug" /export:initbsddb
! # SUBTRACT LINK32 /verbose /pdb:none
  
  !ELSEIF  "$(CFG)" == "bsddb - Win32 Alpha Debug"
***************
*** 106,115 ****
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
- MTL=midl.exe
- # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
- # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
  CPP=cl.exe
  # ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\bsddb\include" /I "..\..\bsddb\port\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  # ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\bsddb\include" /I "..\..\bsddb\port\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  RSC=rc.exe
  # ADD BASE RSC /l 0x409 /d "_DEBUG"
--- 106,115 ----
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  CPP=cl.exe
  # ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\bsddb\include" /I "..\..\bsddb\port\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  # ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\bsddb\include" /I "..\..\bsddb\port\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+ MTL=midl.exe
+ # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+ # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
  RSC=rc.exe
  # ADD BASE RSC /l 0x409 /d "_DEBUG"
***************
*** 122,126 ****
  # SUBTRACT BASE LINK32 /pdb:none
  # ADD LINK32 ..\..\bsddb\port\win32\db.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /nodefaultlib:"MSVCRT" /out:"alpha-temp-debug\bsddb_d.pyd" /pdbtype:sept /libpath:"Debug" /export:initbsddb
! # SUBTRACT LINK32 /pdb:none
  
  !ELSEIF  "$(CFG)" == "bsddb - Win32 Alpha Release"
--- 122,126 ----
  # SUBTRACT BASE LINK32 /pdb:none
  # ADD LINK32 ..\..\bsddb\port\win32\db.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /nodefaultlib:"MSVCRT" /out:"alpha-temp-debug\bsddb_d.pyd" /pdbtype:sept /libpath:"Debug" /export:initbsddb
! # SUBTRACT LINK32 /verbose /pdb:none
  
  !ELSEIF  "$(CFG)" == "bsddb - Win32 Alpha Release"
***************
*** 138,147 ****
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
- MTL=midl.exe
- # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
- # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
  CPP=cl.exe
  # ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\bsddb\include" /I "..\..\bsddb\port\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  # ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\Include" /I "..\PC" /I "..\..\bsddb\include" /I "..\..\bsddb\port\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  RSC=rc.exe
  # ADD BASE RSC /l 0x409 /d "NDEBUG"
--- 138,147 ----
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  CPP=cl.exe
  # ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\bsddb\include" /I "..\..\bsddb\port\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  # ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\Include" /I "..\PC" /I "..\..\bsddb\include" /I "..\..\bsddb\port\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+ MTL=midl.exe
+ # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+ # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
  RSC=rc.exe
  # ADD BASE RSC /l 0x409 /d "NDEBUG"
***************
*** 154,158 ****
  # SUBTRACT BASE LINK32 /pdb:none
  # ADD LINK32 ..\..\bsddb\port\win32\db.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-release\bsddb.pyd" /libpath:"Release" /export:initbsddb
! # SUBTRACT LINK32 /pdb:none
  
  !ENDIF 
--- 154,158 ----
  # SUBTRACT BASE LINK32 /pdb:none
  # ADD LINK32 ..\..\bsddb\port\win32\db.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-release\bsddb.pyd" /libpath:"Release" /export:initbsddb
! # SUBTRACT LINK32 /verbose /pdb:none
  
  !ENDIF 

Index: parser.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/parser.dsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** parser.dsp	2000/02/03 17:19:35	1.6
--- parser.dsp	2000/03/29 01:54:24	1.7
***************
*** 106,115 ****
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
- MTL=midl.exe
- # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
- # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
  CPP=cl.exe
  # ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  # ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  RSC=rc.exe
  # ADD BASE RSC /l 0x409 /d "_DEBUG"
--- 106,115 ----
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  CPP=cl.exe
  # ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  # ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+ MTL=midl.exe
+ # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+ # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
  RSC=rc.exe
  # ADD BASE RSC /l 0x409 /d "_DEBUG"
***************
*** 138,147 ****
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
- MTL=midl.exe
- # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
- # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
  CPP=cl.exe
  # ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  # ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  RSC=rc.exe
  # ADD BASE RSC /l 0x409 /d "NDEBUG"
--- 138,147 ----
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  CPP=cl.exe
  # ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  # ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+ MTL=midl.exe
+ # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+ # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
  RSC=rc.exe
  # ADD BASE RSC /l 0x409 /d "NDEBUG"

Index: pcbuild.dsw
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/pcbuild.dsw,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** pcbuild.dsw	2000/03/28 20:37:33	1.7
--- pcbuild.dsw	2000/03/29 01:54:24	1.8
***************
*** 13,17 ****
  {{{
      Begin Project Dependency
!     Project_Dep_Name python15
      End Project Dependency
  }}}
--- 13,17 ----
  {{{
      Begin Project Dependency
!     Project_Dep_Name python16
      End Project Dependency
  }}}
***************
*** 28,32 ****
  {{{
      Begin Project Dependency
!     Project_Dep_Name python15
      End Project Dependency
  }}}
--- 28,32 ----
  {{{
      Begin Project Dependency
!     Project_Dep_Name python16
      End Project Dependency
  }}}
***************
*** 43,47 ****
  {{{
      Begin Project Dependency
!     Project_Dep_Name python15
      End Project Dependency
  }}}
--- 43,47 ----
  {{{
      Begin Project Dependency
!     Project_Dep_Name python16
      End Project Dependency
  }}}
***************
*** 58,62 ****
  {{{
      Begin Project Dependency
!     Project_Dep_Name python15
      End Project Dependency
  }}}
--- 58,62 ----
  {{{
      Begin Project Dependency
!     Project_Dep_Name python16
      End Project Dependency
  }}}
***************
*** 64,68 ****
  ###############################################################################
  
! Project: "python15"=".\python15.dsp" - Package Owner=<4>
  
  Package=<5>
--- 64,68 ----
  ###############################################################################
  
! Project: "python16"=".\python16.dsp" - Package Owner=<4>
  
  Package=<5>
***************
*** 85,89 ****
  {{{
      Begin Project Dependency
!     Project_Dep_Name python15
      End Project Dependency
  }}}
--- 85,89 ----
  {{{
      Begin Project Dependency
!     Project_Dep_Name python16
      End Project Dependency
  }}}
***************
*** 100,104 ****
  {{{
      Begin Project Dependency
!     Project_Dep_Name python15
      End Project Dependency
  }}}
--- 100,104 ----
  {{{
      Begin Project Dependency
!     Project_Dep_Name python16
      End Project Dependency
  }}}
***************
*** 115,119 ****
  {{{
      Begin Project Dependency
!     Project_Dep_Name python15
      End Project Dependency
  }}}
--- 115,119 ----
  {{{
      Begin Project Dependency
!     Project_Dep_Name python16
      End Project Dependency
  }}}
***************
*** 132,135 ****
  
  ###############################################################################
- 
  
--- 132,134 ----

Index: python.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/python.dsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** python.dsp	2000/02/03 17:19:35	1.8
--- python.dsp	2000/03/29 01:54:24	1.9
***************
*** 54,58 ****
  LINK32=link.exe
  # ADD BASE 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 /machine:I386
! # 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"
--- 54,58 ----
  LINK32=link.exe
  # ADD BASE 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 /machine:I386
! # ADD LINK32 odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"Release"
  
  !ELSEIF  "$(CFG)" == "python - Win32 Debug"
***************
*** 80,84 ****
  LINK32=link.exe
  # ADD BASE 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 /pdbtype:sept
! # 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 /out:"./python_d.exe" /pdbtype:sept /libpath:"Debug"
  
  !ELSEIF  "$(CFG)" == "python - Win32 Alpha Debug"
--- 80,84 ----
  LINK32=link.exe
  # ADD BASE 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 /pdbtype:sept
! # ADD LINK32 odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /out:"./python_d.exe" /pdbtype:sept /libpath:"Debug"
  
  !ELSEIF  "$(CFG)" == "python - Win32 Alpha Debug"