[Python-checkins] CVS: python/dist/src/Tools/bgen/bgen macsupport.py,1.15,1.16 scantools.py,1.15,1.16
Guido van Rossum
guido@cnri.reston.va.us
Thu, 20 Jan 2000 15:49:31 -0500 (EST)
Update of /projects/cvsroot/python/dist/src/Tools/bgen/bgen
In directory eric:/projects/python/develop/guido/src/Tools/bgen/bgen
Modified Files:
macsupport.py scantools.py
Log Message:
Two patches from Jack Jansen:
Three bgen mods:
- support for FSSpecs passed-by-value and points-passed-by-reference added.
- strip single-line comments when parsing header files
- if a definition is blacklisted _do_ output it, but in comment
Index: macsupport.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/bgen/bgen/macsupport.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** macsupport.py 1999/09/30 14:15:14 1.15
--- macsupport.py 2000/01/20 20:49:28 1.16
***************
*** 16,20 ****
Size = Type("Size", "l")
Style = Type("Style", "b")
! StyleParameter = Type("StyleParameter", "h")
CharParameter = Type("CharParameter", "h")
TextEncoding = Type("TextEncoding", "l")
--- 16,20 ----
Size = Type("Size", "l")
Style = Type("Style", "b")
! StyleParameter = Type("Style", "h")
CharParameter = Type("CharParameter", "h")
TextEncoding = Type("TextEncoding", "l")
***************
*** 32,36 ****
# File System Specifications
! FSSpec_ptr = OpaqueType("FSSpec", "PyMac_BuildFSSpec", "PyMac_GetFSSpec")
# OSType and ResType: 4-byte character strings
--- 32,36 ----
# File System Specifications
! FSSpec = FSSpec_ptr = OpaqueType("FSSpec", "PyMac_BuildFSSpec", "PyMac_GetFSSpec")
# OSType and ResType: 4-byte character strings
***************
*** 67,70 ****
--- 67,71 ----
Rect = Rect_ptr = OpaqueType("Rect", "PyMac_BuildRect", "PyMac_GetRect")
Point = OpaqueByValueType("Point", "PyMac_BuildPoint", "PyMac_GetPoint")
+ Point_ptr = OpaqueType("Point", "PyMac_BuildPoint", "PyMac_GetPoint")
# Event records
***************
*** 85,89 ****
InBuffer = VarInputBufferType('char', 'long', 'l') # (buf, len)
- OptionalInBuffer = OptionalVarInputBufferType('char', 'long', 'l') # (buf, len)
InOutBuffer = HeapInputOutputBufferType('char', 'long', 'l') # (inbuf, outbuf, len)
--- 86,89 ----
***************
*** 152,158 ****
# errorCheck method.
class OSErrMixIn:
! "Mix-in class to treat OSErr/OSStatus return values special"
def makereturnvar(self):
! if self.returntype.__class__ == OSErrType:
return Variable(self.returntype, "_err", ErrorMode)
else:
--- 152,158 ----
# errorCheck method.
class OSErrMixIn:
! "Mix-in class to treat OSErr return values special"
def makereturnvar(self):
! if self.returntype is OSErr:
return Variable(self.returntype, "_err", ErrorMode)
else:
Index: scantools.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/bgen/bgen/scantools.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** scantools.py 1998/04/28 16:04:50 1.15
--- scantools.py 2000/01/20 20:49:28 1.16
***************
*** 235,242 ****
self.whole_pat = self.type_pat + self.name_pat + self.args_pat
# self.sym_pat = "^[ \t]*\(<name>[a-zA-Z0-9_]+\)[ \t]*=" + \
! # "[ \t]*\(<defn>[-0-9'\"][^\t\n,;}]*\),?"
self.sym_pat = "^[ \t]*\(<name>[a-zA-Z0-9_]+\)[ \t]*=" + \
! "[ \t]*\(<defn>[-0-9_a-zA-Z'\"][^\t\n,;}]*\),?"
self.asplit_pat = "^\(<type>.*[^a-zA-Z0-9_]\)\(<name>[a-zA-Z0-9_]+\)$"
def compilepatterns(self):
--- 235,245 ----
self.whole_pat = self.type_pat + self.name_pat + self.args_pat
# self.sym_pat = "^[ \t]*\(<name>[a-zA-Z0-9_]+\)[ \t]*=" + \
! # "[ \t]*\(<defn>[-0-9'\"(][^\t\n,;}]*\),?"
self.sym_pat = "^[ \t]*\(<name>[a-zA-Z0-9_]+\)[ \t]*=" + \
! "[ \t]*\(<defn>[-0-9_a-zA-Z'\"(][^\t\n,;}]*\),?"
self.asplit_pat = "^\(<type>.*[^a-zA-Z0-9_]\)\(<name>[a-zA-Z0-9_]+\)$"
+ self.comment1_pat = "\(<rest>.*\)//.*"
+ # note that the next pattern only removes comments that are wholly within one line
+ self.comment2_pat = "\(<rest>.*\)/\*.*\*/"
def compilepatterns(self):
***************
*** 373,376 ****
--- 376,383 ----
try: line = self.getline()
except EOFError: break
+ if self.comment1.match(line) >= 0:
+ line = self.comment1.group('rest')
+ if self.comment2.match(line) >= 0:
+ line = self.comment2.group('rest')
if self.defsfile and self.sym.match(line) >= 0:
self.dosymdef()
***************
*** 387,390 ****
--- 394,399 ----
if not name in self.blacklistnames:
self.defsfile.write("%s = %s\n" % (name, defn))
+ else:
+ self.defsfile.write("# %s = %s\n" % (name, defn))
def dofuncspec(self):
Return-Path: <guido@kaluha.cnri.reston.va.us>
Delivered-To: python-checkins@dinsdale.python.org
Received: from python.org (parrot.python.org [132.151.1.90])
by dinsdale.python.org (Postfix) with ESMTP id 60F481CFD2
for <python-checkins@dinsdale.python.org>; Thu, 20 Jan 2000 16:30:38 -0500 (EST)
Received: from cnri.reston.va.us (ns.CNRI.Reston.VA.US [132.151.1.1] (may be forged))
by python.org (8.9.1a/8.9.1) with ESMTP id QAA12354
for <python-checkins@python.org>; Thu, 20 Jan 2000 16:30:38 -0500 (EST)
Received: from kaluha.cnri.reston.va.us (kaluha.cnri.reston.va.us [132.151.7.31])
by cnri.reston.va.us (8.9.1a/8.9.1) with ESMTP id QAA06984
for <python-checkins@python.org>; Thu, 20 Jan 2000 16:30:36 -0500 (EST)
Received: from eric.cnri.reston.va.us (eric.cnri.reston.va.us [10.27.10.23])
by kaluha.cnri.reston.va.us (8.9.1b+Sun/8.9.1) with ESMTP id QAA29153
for <python-checkins@python.org>; Thu, 20 Jan 2000 16:31:46 -0500 (EST)
Received: (from guido@localhost)
by eric.cnri.reston.va.us (8.9.3+Sun/8.9.1) id QAA23064
for python-checkins@python.org; Thu, 20 Jan 2000 16:31:45 -0500 (EST)
Date: Thu, 20 Jan 2000 16:31:45 -0500 (EST)
From: Guido van Rossum <guido@cnri.reston.va.us>
Message-Id: <200001202131.QAA23064@eric.cnri.reston.va.us>
To: python-checkins@python.org
Subject: [Python-checkins] CVS: python/dist/src/PCbuild _tkinter.dsp,1.7,1.8 bsddb.dsp,1.5,1.6 parser.dsp,1.4,1.5 pcbuild.dsw,1.5,1.6 python.dsp,1.6,1.7 python15.dsp,1.9,1.10 pythonw.dsp,1.5,1.6 zlib.dsp,1.6,1.7
Sender: python-checkins-admin@python.org
Errors-To: python-checkins-admin@python.org
X-BeenThere: python-checkins@python.org
X-Mailman-Version: 1.2 (experimental)
Precedence: bulk
List-Id: Check-in messages from the Python maintainers <python-checkins.python.org>
Update of /projects/cvsroot/python/dist/src/PCbuild
In directory eric:/tmp/python/dist/src/PCbuild
Modified Files:
_tkinter.dsp bsddb.dsp parser.dsp pcbuild.dsw python.dsp
python15.dsp pythonw.dsp zlib.dsp
Log Message:
Changes by Trent Mick (of ActiveState) and Dale Nagata to support
building for NT Alpha as well as NT x86.
Index: _tkinter.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/_tkinter.dsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** _tkinter.dsp 1998/12/22 21:43:35 1.7
--- _tkinter.dsp 2000/01/20 21:31:41 1.8
***************
*** 1,9 ****
# Microsoft Developer Studio Project File - Name="_tkinter" - Package Owner=<4>
! # Microsoft Developer Studio Generated Build File, Format Version 5.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
! CFG=_tkinter - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
--- 1,10 ----
# Microsoft Developer Studio Project File - Name="_tkinter" - Package Owner=<4>
! # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+ # TARGTYPE "Win32 (ALPHA) Dynamic-Link Library" 0x0602
! CFG=_tkinter - Win32 Alpha Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
***************
*** 14,34 ****
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
! !MESSAGE NMAKE /f "_tkinter.mak" CFG="_tkinter - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
! !MESSAGE "_tkinter - Win32 Release" (based on\
! "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "_tkinter - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
# PROP Scc_ProjName "_tkinter"
# PROP Scc_LocalPath "..\..\.."
- CPP=cl.exe
- MTL=midl.exe
- RSC=rc.exe
! !IF "$(CFG)" == "_tkinter - Win32 Release"
# PROP BASE Use_MFC 0
--- 15,34 ----
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
! !MESSAGE NMAKE /f "_tkinter.mak" CFG="_tkinter - Win32 Alpha Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
! !MESSAGE "_tkinter - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "_tkinter - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library")
! !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
# Begin Project
+ # PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName "_tkinter"
# PROP Scc_LocalPath "..\..\.."
! !IF "$(CFG)" == "_tkinter - Win32 x86 Release"
# PROP BASE Use_MFC 0
***************
*** 40,51 ****
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "."
! # PROP Intermediate_Dir "temp-release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
F90=df.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
! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
--- 40,54 ----
# 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"
***************
*** 58,79 ****
# SUBTRACT LINK32 /pdb:none
! !ELSEIF "$(CFG)" == "_tkinter - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
! # PROP BASE Output_Dir "_tkinter"
! # PROP BASE Intermediate_Dir "_tkinter"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
! # PROP Intermediate_Dir "temp-debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
F90=df.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
! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
--- 61,85 ----
# SUBTRACT LINK32 /pdb:none
! !ELSEIF "$(CFG)" == "_tkinter - Win32 x86 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"
***************
*** 86,102 ****
# SUBTRACT LINK32 /pdb:none
!ENDIF
# Begin Target
! # Name "_tkinter - Win32 Release"
! # Name "_tkinter - Win32 Debug"
# Begin Source File
SOURCE=..\Modules\_tkinter.c
# End Source File
# Begin Source File
SOURCE=..\Modules\tkappinit.c
# End Source File
# End Target
--- 92,196 ----
# SUBTRACT LINK32 /pdb:none
+ !ELSEIF "$(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 ""
+ 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"
+ # 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 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
+ # 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 ""
+ 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"
+ # 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\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
+
!ENDIF
# Begin Target
! # Name "_tkinter - Win32 x86 Release"
! # Name "_tkinter - Win32 x86 Debug"
! # Name "_tkinter - Win32 Alpha Debug"
! # Name "_tkinter - Win32 Alpha Release"
# Begin Source File
SOURCE=..\Modules\_tkinter.c
+
+ !IF "$(CFG)" == "_tkinter - Win32 x86 Release"
+
+ !ELSEIF "$(CFG)" == "_tkinter - Win32 x86 Debug"
+
+ !ELSEIF "$(CFG)" == "_tkinter - Win32 Alpha Debug"
+
+ !ELSEIF "$(CFG)" == "_tkinter - Win32 Alpha Release"
+
+ !ENDIF
+
# End Source File
# Begin Source File
SOURCE=..\Modules\tkappinit.c
+
+ !IF "$(CFG)" == "_tkinter - Win32 x86 Release"
+
+ !ELSEIF "$(CFG)" == "_tkinter - Win32 x86 Debug"
+
+ !ELSEIF "$(CFG)" == "_tkinter - Win32 Alpha Debug"
+
+ !ELSEIF "$(CFG)" == "_tkinter - Win32 Alpha Release"
+
+ !ENDIF
+
# End Source File
# End Target
Index: bsddb.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/bsddb.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** bsddb.dsp 1998/08/12 02:31:42 1.5
--- bsddb.dsp 2000/01/20 21:31:41 1.6
***************
*** 1,9 ****
# Microsoft Developer Studio Project File - Name="bsddb" - Package Owner=<4>
! # Microsoft Developer Studio Generated Build File, Format Version 5.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
! CFG=bsddb - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
--- 1,10 ----
# Microsoft Developer Studio Project File - Name="bsddb" - Package Owner=<4>
! # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+ # TARGTYPE "Win32 (ALPHA) Dynamic-Link Library" 0x0602
! CFG=bsddb - Win32 Alpha Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
***************
*** 14,33 ****
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
! !MESSAGE NMAKE /f "bsddb.mak" CFG="bsddb - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
! !MESSAGE "bsddb - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "bsddb - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
# PROP Scc_ProjName "bsddb"
# PROP Scc_LocalPath ".."
- CPP=cl.exe
- MTL=midl.exe
- RSC=rc.exe
! !IF "$(CFG)" == "bsddb - Win32 Release"
# PROP BASE Use_MFC 0
--- 15,34 ----
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
! !MESSAGE NMAKE /f "bsddb.mak" CFG="bsddb - Win32 Alpha Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
! !MESSAGE "bsddb - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "bsddb - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "bsddb - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
! !MESSAGE "bsddb - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
!MESSAGE
# Begin Project
+ # PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName "bsddb"
# PROP Scc_LocalPath ".."
! !IF "$(CFG)" == "bsddb - Win32 x86 Release"
# PROP BASE Use_MFC 0
***************
*** 39,49 ****
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "."
! # PROP Intermediate_Dir "temp-release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# 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 "..\..\bsddb\include" /I "..\..\bsddb\port\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
--- 40,54 ----
# 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 "..\..\bsddb\include" /I "..\..\bsddb\port\include" /D "NDEBUG" /D "WIN32" /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"
# ADD RSC /l 0x409 /d "NDEBUG"
***************
*** 56,76 ****
# SUBTRACT LINK32 /pdb:none
! !ELSEIF "$(CFG)" == "bsddb - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
! # PROP BASE Output_Dir "bsddb"
! # PROP BASE Intermediate_Dir "bsddb"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
! # PROP Intermediate_Dir "temp-debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# 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 "..\..\bsddb\include" /I "..\..\bsddb\port\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
--- 61,85 ----
# SUBTRACT LINK32 /pdb:none
! !ELSEIF "$(CFG)" == "bsddb - Win32 x86 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 "..\..\bsddb\include" /I "..\..\bsddb\port\include" /D "_DEBUG" /D "WIN32" /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"
# ADD RSC /l 0x409 /d "_DEBUG"
***************
*** 83,95 ****
# SUBTRACT LINK32 /pdb:none
!ENDIF
# Begin Target
! # Name "bsddb - Win32 Release"
! # Name "bsddb - Win32 Debug"
# Begin Source File
SOURCE=..\Modules\bsddbmodule.c
# End Source File
# End Target
--- 92,181 ----
# SUBTRACT LINK32 /pdb:none
+ !ELSEIF "$(CFG)" == "bsddb - 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 ""
+ 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"
+ # ADD RSC /l 0x409 /d "_DEBUG"
+ BSC32=bscmake.exe
+ # ADD BASE BSC32 /nologo
+ # ADD BSC32 /nologo
+ LINK32=link.exe
+ # ADD BASE 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:"./bsddb_d.pyd" /pdbtype:sept /libpath:"Debug" /export:initbsddb
+ # 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"
+
+ # 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 ""
+ 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"
+ # ADD RSC /l 0x409 /d "NDEBUG"
+ BSC32=bscmake.exe
+ # ADD BASE BSC32 /nologo
+ # ADD BSC32 /nologo
+ LINK32=link.exe
+ # ADD BASE 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:"./bsddb.pyd" /libpath:"Release" /export:initbsddb
+ # 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
# Begin Target
! # Name "bsddb - Win32 x86 Release"
! # Name "bsddb - Win32 x86 Debug"
! # Name "bsddb - Win32 Alpha Debug"
! # Name "bsddb - Win32 Alpha Release"
# Begin Source File
SOURCE=..\Modules\bsddbmodule.c
+
+ !IF "$(CFG)" == "bsddb - Win32 x86 Release"
+
+ !ELSEIF "$(CFG)" == "bsddb - Win32 x86 Debug"
+
+ !ELSEIF "$(CFG)" == "bsddb - Win32 Alpha Debug"
+
+ !ELSEIF "$(CFG)" == "bsddb - Win32 Alpha Release"
+
+ !ENDIF
+
# End Source File
# End Target
Index: parser.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/parser.dsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** parser.dsp 1998/08/08 21:04:17 1.4
--- parser.dsp 2000/01/20 21:31:41 1.5
***************
*** 1,9 ****
# Microsoft Developer Studio Project File - Name="parser" - Package Owner=<4>
! # Microsoft Developer Studio Generated Build File, Format Version 5.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
! CFG=parser - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
--- 1,10 ----
# Microsoft Developer Studio Project File - Name="parser" - Package Owner=<4>
! # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+ # TARGTYPE "Win32 (ALPHA) Dynamic-Link Library" 0x0602
! CFG=parser - Win32 Alpha Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
***************
*** 14,33 ****
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
! !MESSAGE NMAKE /f "parser.mak" CFG="parser - Win32 Debug"
!MESSAGE
!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
# Begin Project
# PROP Scc_ProjName "parser"
# PROP Scc_LocalPath ".."
- CPP=cl.exe
- MTL=midl.exe
- RSC=rc.exe
! !IF "$(CFG)" == "parser - Win32 Release"
# PROP BASE Use_MFC 0
--- 15,34 ----
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
! !MESSAGE NMAKE /f "parser.mak" CFG="parser - Win32 Alpha Debug"
!MESSAGE
!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")
!MESSAGE
# Begin Project
+ # PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName "parser"
# PROP Scc_LocalPath ".."
! !IF "$(CFG)" == "parser - Win32 x86 Release"
# PROP BASE Use_MFC 0
***************
*** 39,49 ****
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "."
! # PROP Intermediate_Dir "temp-release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# 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 "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
--- 40,54 ----
# 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 "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"
# ADD RSC /l 0x409 /d "NDEBUG"
***************
*** 56,76 ****
# SUBTRACT LINK32 /pdb:none
! !ELSEIF "$(CFG)" == "parser - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
! # PROP BASE Output_Dir "parser"
! # PROP BASE Intermediate_Dir "parser"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
! # PROP Intermediate_Dir "temp-debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# 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 "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
--- 61,85 ----
# SUBTRACT LINK32 /pdb:none
! !ELSEIF "$(CFG)" == "parser - Win32 x86 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 "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"
# ADD RSC /l 0x409 /d "_DEBUG"
***************
*** 83,95 ****
# SUBTRACT LINK32 /pdb:none
!ENDIF
# Begin Target
! # Name "parser - Win32 Release"
! # Name "parser - Win32 Debug"
# Begin Source File
SOURCE=..\Modules\parsermodule.c
# End Source File
# End Target
--- 92,181 ----
# SUBTRACT LINK32 /pdb:none
+ !ELSEIF "$(CFG)" == "parser - 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 ""
+ 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"
+ # 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 /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"./parser_d.pyd" /pdbtype:sept /libpath:"Debug" /export:initparser
+ # SUBTRACT BASE LINK32 /pdb:none
+ # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-debug/parser_d.pyd" /pdbtype:sept /libpath:"Debug" /export:initparser
+ # SUBTRACT LINK32 /pdb:none
+
+ !ELSEIF "$(CFG)" == "parser - 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 ""
+ 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"
+ # 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 /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"./parser.pyd" /libpath:"Release" /export:initparser
+ # SUBTRACT BASE LINK32 /pdb:none
+ # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-release/parser.pyd" /libpath:"Release" /export:initparser
+ # SUBTRACT LINK32 /pdb:none
+
!ENDIF
# Begin Target
! # Name "parser - Win32 x86 Release"
! # Name "parser - Win32 x86 Debug"
! # Name "parser - Win32 Alpha Debug"
! # Name "parser - Win32 Alpha Release"
# Begin Source File
SOURCE=..\Modules\parsermodule.c
+
+ !IF "$(CFG)" == "parser - Win32 x86 Release"
+
+ !ELSEIF "$(CFG)" == "parser - Win32 x86 Debug"
+
+ !ELSEIF "$(CFG)" == "parser - Win32 Alpha Debug"
+
+ !ELSEIF "$(CFG)" == "parser - Win32 Alpha Release"
+
+ !ENDIF
+
# End Source File
# End Target
Index: pcbuild.dsw
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/pcbuild.dsw,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** pcbuild.dsw 1998/10/08 01:48:13 1.5
--- pcbuild.dsw 2000/01/20 21:31:41 1.6
***************
*** 1,15 ****
! Microsoft Developer Studio Workspace File, Format Version 5.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
! Project: "_tkinter"=".\_tkinter.dsp" - Package Owner=<4>
Package=<5>
{{{
- begin source code control
- _tkinter
- .
- end source code control
}}}
--- 1,11 ----
! Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
! Project: "_tkinter"=.\_tkinter.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
***************
*** 23,34 ****
###############################################################################
! Project: "bsddb"=".\bsddb.dsp" - Package Owner=<4>
Package=<5>
{{{
- begin source code control
- bsddb
- ..
- end source code control
}}}
--- 19,26 ----
###############################################################################
! Project: "bsddb"=.\bsddb.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
***************
*** 42,53 ****
###############################################################################
! Project: "parser"=".\parser.dsp" - Package Owner=<4>
Package=<5>
{{{
- begin source code control
- parser
- ..
- end source code control
}}}
--- 34,41 ----
###############################################################################
! Project: "parser"=.\parser.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
***************
*** 61,72 ****
###############################################################################
! Project: "python"=".\python.dsp" - Package Owner=<4>
Package=<5>
{{{
- begin source code control
- python
- ..
- end source code control
}}}
--- 49,56 ----
###############################################################################
! Project: "python"=.\python.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
***************
*** 80,91 ****
###############################################################################
! Project: "python15"=".\python15.dsp" - Package Owner=<4>
Package=<5>
{{{
- begin source code control
- python15
- ..
- end source code control
}}}
--- 64,71 ----
###############################################################################
! Project: "python15"=.\python15.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
***************
*** 96,107 ****
###############################################################################
! Project: "pythonw"=".\pythonw.dsp" - Package Owner=<4>
Package=<5>
{{{
- begin source code control
- pythonw
- ..\pc
- end source code control
}}}
--- 76,83 ----
###############################################################################
! Project: "pythonw"=.\pythonw.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
***************
*** 115,126 ****
###############################################################################
! Project: "zlib"=".\zlib.dsp" - Package Owner=<4>
Package=<5>
{{{
- begin source code control
- zlib
- ..
- end source code control
}}}
--- 91,98 ----
###############################################################################
! Project: "zlib"=.\zlib.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Index: python.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/python.dsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** python.dsp 1999/12/20 23:02:41 1.6
--- python.dsp 2000/01/20 21:31:41 1.7
***************
*** 1,9 ****
# Microsoft Developer Studio Project File - Name="python" - Package Owner=<4>
! # Microsoft Developer Studio Generated Build File, Format Version 5.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
! CFG=python - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
--- 1,10 ----
# Microsoft Developer Studio Project File - Name="python" - Package Owner=<4>
! # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
+ # TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
! CFG=python - Win32 Alpha Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
***************
*** 14,32 ****
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
! !MESSAGE NMAKE /f "python.mak" CFG="python - Win32 Debug"
!MESSAGE
!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
# Begin Project
# PROP Scc_ProjName "python"
# PROP Scc_LocalPath ".."
- CPP=cl.exe
- RSC=rc.exe
! !IF "$(CFG)" == "python - Win32 Release"
# PROP BASE Use_MFC 0
--- 15,34 ----
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
! !MESSAGE NMAKE /f "python.mak" CFG="python - Win32 Alpha Debug"
!MESSAGE
!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")
!MESSAGE
# Begin Project
+ # PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName "python"
# PROP Scc_LocalPath ".."
! !IF "$(CFG)" == "python - Win32 x86 Release"
# PROP BASE Use_MFC 0
***************
*** 38,46 ****
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "."
! # PROP Intermediate_Dir "temp-release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
--- 40,50 ----
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "."
! # PROP Intermediate_Dir "x86-temp-release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
+ CPP=cl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+ RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
***************
*** 50,56 ****
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 setargv.obj 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
--- 54,60 ----
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 x86 Debug"
# PROP BASE Use_MFC 0
***************
*** 62,70 ****
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
! # PROP Intermediate_Dir "temp-debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /i "..\Include" /d "_DEBUG"
--- 66,76 ----
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
! # PROP Intermediate_Dir "x86-temp-debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
+ CPP=cl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
+ RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /i "..\Include" /d "_DEBUG"
***************
*** 74,85 ****
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 setargv.obj 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"
!ENDIF
# Begin Target
! # Name "python - Win32 Release"
! # Name "python - Win32 Debug"
# Begin Source File
--- 80,147 ----
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"
+ # 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 /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
+ # ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
+ RSC=rc.exe
+ # ADD BASE RSC /l 0x409 /i "..\Include" /d "_DEBUG"
+ # ADD RSC /l 0x409 /i "..\Include" /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 /nologo /subsystem:console /debug /machine:ALPHA /out:"./python_d.exe" /pdbtype:sept /libpath:"Debug"
+ # ADD LINK32 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:ALPHA /out:"./python_d.exe" /pdbtype:sept /libpath:"Debug"
+
+ !ELSEIF "$(CFG)" == "python - 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 /Gt0 /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+ # ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+ 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 /nologo /subsystem:console /debug /machine:ALPHA /libpath:"Release"
+ # ADD LINK32 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:ALPHA /libpath:"Release"
+
!ENDIF
# Begin Target
! # Name "python - Win32 x86 Release"
! # Name "python - Win32 x86 Debug"
! # Name "python - Win32 Alpha Debug"
! # Name "python - Win32 Alpha Release"
# Begin Source File
***************
*** 89,103 ****
SOURCE=..\Modules\python.c
- # End Source File
- # Begin Source File
! SOURCE=..\PC\python_exe.rc
! !IF "$(CFG)" == "python - Win32 Release"
! !ELSEIF "$(CFG)" == "python - Win32 Debug"
!ENDIF
# End Source File
# End Target
--- 151,169 ----
SOURCE=..\Modules\python.c
! !IF "$(CFG)" == "python - Win32 x86 Release"
!
! !ELSEIF "$(CFG)" == "python - Win32 x86 Debug"
! !ELSEIF "$(CFG)" == "python - Win32 Alpha Debug"
! !ELSEIF "$(CFG)" == "python - Win32 Alpha Release"
!ENDIF
+ # End Source File
+ # Begin Source File
+
+ SOURCE=..\PC\python_exe.rc
# End Source File
# End Target
Index: python15.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/python15.dsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** python15.dsp 1999/12/20 23:00:10 1.9
--- python15.dsp 2000/01/20 21:31:41 1.10
***************
*** 1,9 ****
# Microsoft Developer Studio Project File - Name="python15" - Package Owner=<4>
! # Microsoft Developer Studio Generated Build File, Format Version 5.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
! CFG=python15 - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
--- 1,10 ----
[...1966 lines suppressed...]
+
+ !ENDIF
+
# End Source File
# Begin Source File
SOURCE=..\Modules\yuvconvert.c
+
+ !IF "$(CFG)" == "python15 - Win32 x86 Release"
+
+ !ELSEIF "$(CFG)" == "python15 - Win32 x86 Debug"
+
+ !ELSEIF "$(CFG)" == "python15 - Win32 Alpha Debug"
+
+ !ELSEIF "$(CFG)" == "python15 - Win32 Alpha Release"
+
+ !ENDIF
+
# End Source File
# End Target
Index: pythonw.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/pythonw.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** pythonw.dsp 1998/08/13 18:54:51 1.5
--- pythonw.dsp 2000/01/20 21:31:41 1.6
***************
*** 1,9 ****
# Microsoft Developer Studio Project File - Name="pythonw" - Package Owner=<4>
! # Microsoft Developer Studio Generated Build File, Format Version 5.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Application" 0x0101
! CFG=pythonw - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
--- 1,10 ----
# Microsoft Developer Studio Project File - Name="pythonw" - Package Owner=<4>
! # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Application" 0x0101
+ # TARGTYPE "Win32 (ALPHA) Application" 0x0601
! CFG=pythonw - Win32 Alpha Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
***************
*** 14,33 ****
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
! !MESSAGE NMAKE /f "pythonw.mak" CFG="pythonw - Win32 Debug"
!MESSAGE
!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
# Begin Project
# PROP Scc_ProjName "pythonw"
# PROP Scc_LocalPath "..\pc"
- CPP=cl.exe
- MTL=midl.exe
- RSC=rc.exe
! !IF "$(CFG)" == "pythonw - Win32 Release"
# PROP BASE Use_MFC 0
--- 15,34 ----
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
! !MESSAGE NMAKE /f "pythonw.mak" CFG="pythonw - Win32 Alpha Debug"
!MESSAGE
!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")
!MESSAGE
# Begin Project
+ # PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName "pythonw"
# PROP Scc_LocalPath "..\pc"
! !IF "$(CFG)" == "pythonw - Win32 x86 Release"
# PROP BASE Use_MFC 0
***************
*** 39,49 ****
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "."
! # PROP Intermediate_Dir "temp-release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
--- 40,53 ----
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "."
! # PROP Intermediate_Dir "x86-temp-release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
+ CPP=cl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /Zi /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"
# ADD RSC /l 0x409 /d "NDEBUG"
***************
*** 56,60 ****
# SUBTRACT LINK32 /pdb:none
! !ELSEIF "$(CFG)" == "pythonw - Win32 Debug"
# PROP BASE Use_MFC 0
--- 60,64 ----
# SUBTRACT LINK32 /pdb:none
! !ELSEIF "$(CFG)" == "pythonw - Win32 x86 Debug"
# PROP BASE Use_MFC 0
***************
*** 66,76 ****
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
! # PROP Intermediate_Dir "temp-debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /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" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
--- 70,83 ----
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
! # PROP Intermediate_Dir "x86-temp-debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
+ CPP=cl.exe
# ADD BASE CPP /nologo /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" /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"
# ADD RSC /l 0x409 /d "_DEBUG"
***************
*** 83,106 ****
# SUBTRACT LINK32 /pdb:none
!ENDIF
# Begin Target
! # Name "pythonw - Win32 Release"
! # Name "pythonw - Win32 Debug"
# Begin Source File
SOURCE=..\PC\python_exe.rc
! !IF "$(CFG)" == "pythonw - Win32 Release"
! !ELSEIF "$(CFG)" == "pythonw - Win32 Debug"
! !ENDIF
! # End Source File
! # Begin Source File
! SOURCE=..\PC\WinMain.c
# End Source File
# End Target
--- 90,183 ----
# SUBTRACT LINK32 /pdb:none
+ !ELSEIF "$(CFG)" == "pythonw - 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 ""
+ 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 /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+ # ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+ 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 /nologo /base:"0x1e190000" /subsystem:windows /debug /machine:ALPHA /out:"./pythonw_d.exe" /pdbtype:sept /libpath:"Debug"
+ # SUBTRACT BASE LINK32 /pdb:none
+ # ADD LINK32 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 /debug /machine:ALPHA /out:"./pythonw_d.exe" /pdbtype:sept /libpath:"Debug"
+ # SUBTRACT LINK32 /pdb:none
+
+ !ELSEIF "$(CFG)" == "pythonw - 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 ""
+ 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 /Gt0 /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /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"
+ # 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 /nologo /base:"0x1e190000" /subsystem:windows /debug /machine:ALPHA /libpath:"Release"
+ # SUBTRACT BASE LINK32 /pdb:none
+ # ADD LINK32 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 /debug /machine:ALPHA /libpath:"Release"
+ # SUBTRACT LINK32 /pdb:none
+
!ENDIF
# Begin Target
! # Name "pythonw - Win32 x86 Release"
! # Name "pythonw - Win32 x86 Debug"
! # Name "pythonw - Win32 Alpha Debug"
! # Name "pythonw - Win32 Alpha Release"
# Begin Source File
SOURCE=..\PC\python_exe.rc
+ # End Source File
+ # Begin Source File
! SOURCE=..\PC\WinMain.c
! !IF "$(CFG)" == "pythonw - Win32 x86 Release"
! !ELSEIF "$(CFG)" == "pythonw - Win32 x86 Debug"
! !ELSEIF "$(CFG)" == "pythonw - Win32 Alpha Debug"
! !ELSEIF "$(CFG)" == "pythonw - Win32 Alpha Release"
!
! !ENDIF
!
# End Source File
# End Target
Index: zlib.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/zlib.dsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** zlib.dsp 1999/04/08 20:49:11 1.6
--- zlib.dsp 2000/01/20 21:31:41 1.7
***************
*** 1,9 ****
# Microsoft Developer Studio Project File - Name="zlib" - Package Owner=<4>
! # Microsoft Developer Studio Generated Build File, Format Version 5.00
# ** DO NOT EDIT **
# 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
--- 1,9 ----
# Microsoft Developer Studio Project File - Name="zlib" - Package Owner=<4>
! # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# 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
***************
*** 14,26 ****
!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
# Begin Project
# PROP Scc_ProjName "zlib"
# PROP Scc_LocalPath ".."
--- 14,27 ----
!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
# Begin Project
+ # PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName "zlib"
# PROP Scc_LocalPath ".."
***************
*** 29,33 ****
RSC=rc.exe
! !IF "$(CFG)" == "zlib - Win32 Release"
# PROP BASE Use_MFC 0
--- 30,34 ----
RSC=rc.exe
! !IF "$(CFG)" == "zlib - Win32 x86 Release"
# PROP BASE Use_MFC 0
***************
*** 39,43 ****
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "."
! # PROP Intermediate_Dir "temp-release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
--- 40,44 ----
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "."
! # PROP Intermediate_Dir "x86-temp-release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
***************
*** 45,50 ****
# 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 "..\..\zlib113" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
--- 46,51 ----
# 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 "..\..\zlib113" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
***************
*** 57,71 ****
# SUBTRACT LINK32 /pdb:none
! !ELSEIF "$(CFG)" == "zlib - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
! # PROP BASE Output_Dir "zlib"
! # PROP BASE Intermediate_Dir "zlib"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
! # PROP Intermediate_Dir "temp-debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
--- 58,72 ----
# SUBTRACT LINK32 /pdb:none
! !ELSEIF "$(CFG)" == "zlib - Win32 x86 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 ""
***************
*** 73,78 ****
# 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 "..\..\zlib113" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
--- 74,79 ----
# 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 "..\..\zlib113" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
***************
*** 89,94 ****
# Begin Target
! # Name "zlib - Win32 Release"
! # Name "zlib - Win32 Debug"
# Begin Source File
--- 90,95 ----
# Begin Target
! # Name "zlib - Win32 x86 Release"
! # Name "zlib - Win32 x86 Debug"
# Begin Source File