[Stackless-checkins] CVS: slpdev/src/2.2/src/PC/example_nt example.dsp, 1.1.1.2, 1.2 example.dsw, 1.1.1.2, 1.2

Christian Tismer tismer at centera.de
Sat May 1 00:11:29 CEST 2004


Update of /home/cvs/slpdev/src/2.2/src/PC/example_nt
In directory centera.de:/tmp/cvs-serv13270/src/PC/example_nt

Modified Files:
	example.dsp example.dsw 
Log Message:
checking Python 2.2.3 back in, almost unmodified.
The only modifications are in PCbuild, and the additon of the
new Stackless for 2.3.3 trunk.

Purpose: I will apply all current changes to 2.3.3 back to 2.2.3.
Since I'm unsure how to do this on the current dev trunk by CVS,
and since I never imported 2.2.3 before, I prefer to do it this
way, using the merge program explicitly.


Index: example.dsp
===================================================================
RCS file: /home/cvs/slpdev/src/2.2/src/PC/example_nt/example.dsp,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -C2 -d -r1.1.1.2 -r1.2
*** example.dsp	9 May 2002 18:27:30 -0000	1.1.1.2
--- example.dsp	30 Apr 2004 22:11:26 -0000	1.2
***************
*** 1,117 ****
! # Microsoft Developer Studio Project File - Name="example" - Package Owner=<4>
! # Microsoft Developer Studio Generated Build File, Format Version 6.00
! # ** DO NOT EDIT **
! 
! # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
! 
! CFG=example - Win32 Release
! !MESSAGE This is not a valid makefile. To build this project using NMAKE,
! !MESSAGE use the Export Makefile command and run
! !MESSAGE 
! !MESSAGE NMAKE /f "example.mak".
! !MESSAGE 
! !MESSAGE You can specify a configuration when running NMAKE
! !MESSAGE by defining the macro CFG on the command line. For example:
! !MESSAGE 
! !MESSAGE NMAKE /f "example.mak" CFG="example - Win32 Release"
! !MESSAGE 
! !MESSAGE Possible choices for configuration are:
! !MESSAGE 
! !MESSAGE "example - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "example - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE 
! 
! # Begin Project
! # PROP AllowPerConfigDependencies 0
! # PROP Scc_ProjName ""
! # PROP Scc_LocalPath ""
! CPP=cl.exe
! MTL=midl.exe
! RSC=rc.exe
! 
! !IF  "$(CFG)" == "example - 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 ".\Release"
! # PROP Intermediate_Dir ".\Release"
! # PROP Ignore_Export_Lib 0
! # PROP Target_Dir ""
! # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
! # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
! # ADD BASE MTL /nologo /D "NDEBUG" /win32
! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
! # 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib python22.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\PCbuild" /export:initexample
! # SUBTRACT LINK32 /pdb:none
! 
! !ELSEIF  "$(CFG)" == "example - 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 ".\Debug"
! # PROP Intermediate_Dir ".\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 /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" /win32
! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
! # 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
! # 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 python22_d.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:".\Debug/example_d.dll" /libpath:"..\PCbuild" /export:initexample
! # SUBTRACT LINK32 /pdb:none
! 
! !ENDIF 
! 
! # Begin Target
! 
! # Name "example - Win32 Release"
! # Name "example - Win32 Debug"
! # Begin Group "Source Files"
! 
! # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
! # Begin Source File
! 
! SOURCE=.\example.c
! # End Source File
! # Begin Source File
! 
! SOURCE=.\example.def
! # End Source File
! # Begin Source File
! 
! SOURCE=.\readme.txt
! # End Source File
! # End Group
! # Begin Group "Header Files"
! 
! # PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
! # End Group
! # Begin Group "Resource Files"
! 
! # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
! # End Group
! # End Target
! # End Project
--- 1,117 ----
! # Microsoft Developer Studio Project File - Name="example" - Package Owner=<4>
! # Microsoft Developer Studio Generated Build File, Format Version 6.00
! # ** DO NOT EDIT **
! 
! # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
! 
! CFG=example - Win32 Release
! !MESSAGE This is not a valid makefile. To build this project using NMAKE,
! !MESSAGE use the Export Makefile command and run
! !MESSAGE 
! !MESSAGE NMAKE /f "example.mak".
! !MESSAGE 
! !MESSAGE You can specify a configuration when running NMAKE
! !MESSAGE by defining the macro CFG on the command line. For example:
! !MESSAGE 
! !MESSAGE NMAKE /f "example.mak" CFG="example - Win32 Release"
! !MESSAGE 
! !MESSAGE Possible choices for configuration are:
! !MESSAGE 
! !MESSAGE "example - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "example - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE 
! 
! # Begin Project
! # PROP AllowPerConfigDependencies 0
! # PROP Scc_ProjName ""
! # PROP Scc_LocalPath ""
! CPP=cl.exe
! MTL=midl.exe
! RSC=rc.exe
! 
! !IF  "$(CFG)" == "example - 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 ".\Release"
! # PROP Intermediate_Dir ".\Release"
! # PROP Ignore_Export_Lib 0
! # PROP Target_Dir ""
! # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
! # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
! # ADD BASE MTL /nologo /D "NDEBUG" /win32
! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
! # 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib python22.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\PCbuild" /export:initexample
! # SUBTRACT LINK32 /pdb:none
! 
! !ELSEIF  "$(CFG)" == "example - 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 ".\Debug"
! # PROP Intermediate_Dir ".\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 /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" /win32
! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
! # 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
! # 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 python22_d.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:".\Debug/example_d.dll" /libpath:"..\PCbuild" /export:initexample
! # SUBTRACT LINK32 /pdb:none
! 
! !ENDIF 
! 
! # Begin Target
! 
! # Name "example - Win32 Release"
! # Name "example - Win32 Debug"
! # Begin Group "Source Files"
! 
! # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
! # Begin Source File
! 
! SOURCE=.\example.c
! # End Source File
! # Begin Source File
! 
! SOURCE=.\example.def
! # End Source File
! # Begin Source File
! 
! SOURCE=.\readme.txt
! # End Source File
! # End Group
! # Begin Group "Header Files"
! 
! # PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
! # End Group
! # Begin Group "Resource Files"
! 
! # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
! # End Group
! # End Target
! # End Project

Index: example.dsw
===================================================================
RCS file: /home/cvs/slpdev/src/2.2/src/PC/example_nt/example.dsw,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -C2 -d -r1.1.1.2 -r1.2
*** example.dsw	9 May 2002 18:27:30 -0000	1.1.1.2
--- example.dsw	30 Apr 2004 22:11:26 -0000	1.2
***************
*** 1,29 ****
! Microsoft Developer Studio Workspace File, Format Version 6.00
! # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
! 
! ###############################################################################
! 
! Project: "example"=.\example.dsp - Package Owner=<4>
! 
! Package=<5>
! {{{
! }}}
! 
! Package=<4>
! {{{
! }}}
! 
! ###############################################################################
! 
! Global:
! 
! Package=<5>
! {{{
! }}}
! 
! Package=<3>
! {{{
! }}}
! 
! ###############################################################################
! 
--- 1,29 ----
! Microsoft Developer Studio Workspace File, Format Version 6.00
! # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
! 
! ###############################################################################
! 
! Project: "example"=.\example.dsp - Package Owner=<4>
! 
! Package=<5>
! {{{
! }}}
! 
! Package=<4>
! {{{
! }}}
! 
! ###############################################################################
! 
! Global:
! 
! Package=<5>
! {{{
! }}}
! 
! Package=<3>
! {{{
! }}}
! 
! ###############################################################################
! 


_______________________________________________
Stackless-checkins mailing list
Stackless-checkins at stackless.com
http://www.stackless.com/mailman/listinfo/stackless-checkins



More information about the Stackless-checkins mailing list