[Stackless-checkins] CVS: slpdev/src/2.3/dev/PCbuild8 pythoncore.vcproj, 1.1, 1.2

Christian Tismer tismer at centera.de
Tue Dec 20 14:17:51 CET 2005


Update of /home/cvs/slpdev/src/2.3/dev/PCbuild8
In directory centera.de:/tmp/cvs-serv14441/src/2.3/dev/PCbuild8

Modified Files:
	pythoncore.vcproj 
Log Message:
ported x64 to Stackless 3.1 . There is still an issue with taskspeed that doesn't finish. Checking against MSVC 7.0 now...

Index: pythoncore.vcproj
===================================================================
RCS file: /home/cvs/slpdev/src/2.3/dev/PCbuild8/pythoncore.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pythoncore.vcproj	20 Dec 2005 11:19:01 -0000	1.1
--- pythoncore.vcproj	20 Dec 2005 13:17:48 -0000	1.2
***************
*** 437,769 ****
  				>
  				<File
! 					RelativePath="..\Stackless\cframeobject.c"
  					>
- 					<FileConfiguration
- 						Name="Release|Win32"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
- 					<FileConfiguration
- 						Name="Release|x64"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
- 					<FileConfiguration
- 						Name="Debug|Win32"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
- 					<FileConfiguration
- 						Name="Debug|x64"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
  				</File>
  				<File
! 					RelativePath="..\Stackless\channelobject.c"
  					>
- 					<FileConfiguration
- 						Name="Release|Win32"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
- 					<FileConfiguration
- 						Name="Release|x64"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
- 					<FileConfiguration
- 						Name="Debug|Win32"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
- 					<FileConfiguration
- 						Name="Debug|x64"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
  				</File>
  				<File
! 					RelativePath="..\Stackless\flextype.c"
  					>
- 					<FileConfiguration
- 						Name="Release|Win32"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
- 					<FileConfiguration
- 						Name="Release|x64"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
- 					<FileConfiguration
- 						Name="Debug|Win32"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
- 					<FileConfiguration
- 						Name="Debug|x64"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
  				</File>
  				<File
! 					RelativePath="..\Stackless\flextype.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\prickelpit.c"
  					>
- 					<FileConfiguration
- 						Name="Release|Win32"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
- 					<FileConfiguration
- 						Name="Release|x64"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
- 					<FileConfiguration
- 						Name="Debug|Win32"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
- 					<FileConfiguration
- 						Name="Debug|x64"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
  				</File>
  				<File
! 					RelativePath="..\Stackless\prickelpit.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\scheduling.c"
  					>
- 					<FileConfiguration
- 						Name="Release|Win32"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
- 					<FileConfiguration
- 						Name="Release|x64"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
- 					<FileConfiguration
- 						Name="Debug|Win32"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
- 					<FileConfiguration
- 						Name="Debug|x64"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
  				</File>
  				<File
! 					RelativePath="..\Stackless\stackless_util.c"
  					>
- 					<FileConfiguration
- 						Name="Release|Win32"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
- 					<FileConfiguration
- 						Name="Release|x64"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
- 					<FileConfiguration
- 						Name="Debug|Win32"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
- 					<FileConfiguration
- 						Name="Debug|x64"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
  				</File>
  				<File
! 					RelativePath="..\Stackless\stacklessmodule.c"
  					>
- 					<FileConfiguration
- 						Name="Release|Win32"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
- 					<FileConfiguration
- 						Name="Release|x64"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
- 					<FileConfiguration
- 						Name="Debug|Win32"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
- 					<FileConfiguration
- 						Name="Debug|x64"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
  				</File>
  				<File
! 					RelativePath="..\Stackless\taskletobject.c"
  					>
- 					<FileConfiguration
- 						Name="Release|Win32"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
- 					<FileConfiguration
- 						Name="Release|x64"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
- 					<FileConfiguration
- 						Name="Debug|Win32"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
- 					<FileConfiguration
- 						Name="Debug|x64"
- 						>
- 						<Tool
- 							Name="VCCLCompilerTool"
- 							AdditionalIncludeDirectories=""
- 							PreprocessorDefinitions=""
- 						/>
- 					</FileConfiguration>
  				</File>
  				<File
! 					RelativePath="..\Stackless\taskletobject.h"
  					>
  				</File>
--- 437,481 ----
  				>
  				<File
! 					RelativePath="..\Stackless\module\channelobject.c"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\module\channelobject.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\module\flextype.c"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\module\flextype.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\pickling\prickelpit.c"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\pickling\prickelpit.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\pickling\safe_pickle.c"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\module\scheduling.c"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\module\stacklessmodule.c"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\module\taskletobject.c"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\module\taskletobject.h"
  					>
  				</File>
***************
*** 773,777 ****
  				>
  				<File
! 					RelativePath="..\Stackless\slp_transfer.c"
  					>
  					<FileConfiguration
--- 485,493 ----
  				>
  				<File
! 					RelativePath="..\Stackless\core\backwardcompat.h"
! 					>
! 				</File>
! 				<File
! 					RelativePath="..\Stackless\core\cframeobject.c"
  					>
  					<FileConfiguration
***************
*** 780,785 ****
  						<Tool
  							Name="VCCLCompilerTool"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""
  						/>
  					</FileConfiguration>
--- 496,501 ----
  						<Tool
  							Name="VCCLCompilerTool"
! 							ObjectFile="$(IntDir)\$(InputName)1.obj"
! 							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
  						/>
  					</FileConfiguration>
***************
*** 789,794 ****
  						<Tool
  							Name="VCCLCompilerTool"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""
  						/>
  					</FileConfiguration>
--- 505,510 ----
  						<Tool
  							Name="VCCLCompilerTool"
! 							ObjectFile="$(IntDir)\$(InputName)1.obj"
! 							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
  						/>
  					</FileConfiguration>
***************
*** 798,803 ****
  						<Tool
  							Name="VCCLCompilerTool"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""
  						/>
  					</FileConfiguration>
--- 514,519 ----
  						<Tool
  							Name="VCCLCompilerTool"
! 							ObjectFile="$(IntDir)\$(InputName)1.obj"
! 							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
  						/>
  					</FileConfiguration>
***************
*** 807,845 ****
  						<Tool
  							Name="VCCLCompilerTool"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""
  						/>
  					</FileConfiguration>
  				</File>
  				<File
! 					RelativePath="..\Stackless\stackless.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\stackless_api.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\stackless_frame.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\stackless_impl.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\stackless_structs.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\stackless_tstate.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\stackless_version.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\stacklesseval.c"
  					>
  					<FileConfiguration
--- 523,561 ----
  						<Tool
  							Name="VCCLCompilerTool"
! 							ObjectFile="$(IntDir)\$(InputName)1.obj"
! 							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
  						/>
  					</FileConfiguration>
  				</File>
  				<File
! 					RelativePath="..\Stackless\core\cframeobject.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\core\slp_exttype.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\core\slp_transfer.c"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\core\stackless_impl.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\core\stackless_methods.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\core\stackless_structs.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\core\stackless_tstate.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\core\stackless_util.c"
  					>
  					<FileConfiguration
***************
*** 848,853 ****
  						<Tool
  							Name="VCCLCompilerTool"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""
  						/>
  					</FileConfiguration>
--- 564,569 ----
  						<Tool
  							Name="VCCLCompilerTool"
! 							ObjectFile="$(IntDir)\$(InputName)1.obj"
! 							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
  						/>
  					</FileConfiguration>
***************
*** 857,862 ****
  						<Tool
  							Name="VCCLCompilerTool"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""
  						/>
  					</FileConfiguration>
--- 573,578 ----
  						<Tool
  							Name="VCCLCompilerTool"
! 							ObjectFile="$(IntDir)\$(InputName)1.obj"
! 							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
  						/>
  					</FileConfiguration>
***************
*** 866,871 ****
  						<Tool
  							Name="VCCLCompilerTool"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""
  						/>
  					</FileConfiguration>
--- 582,587 ----
  						<Tool
  							Name="VCCLCompilerTool"
! 							ObjectFile="$(IntDir)\$(InputName)1.obj"
! 							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
  						/>
  					</FileConfiguration>
***************
*** 875,883 ****
  						<Tool
  							Name="VCCLCompilerTool"
! 							AdditionalIncludeDirectories=""
! 							PreprocessorDefinitions=""
  						/>
  					</FileConfiguration>
  				</File>
  			</Filter>
  			<Filter
--- 591,603 ----
  						<Tool
  							Name="VCCLCompilerTool"
! 							ObjectFile="$(IntDir)\$(InputName)1.obj"
! 							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
  						/>
  					</FileConfiguration>
  				</File>
+ 				<File
+ 					RelativePath="..\Stackless\core\stacklesseval.c"
+ 					>
+ 				</File>
  			</Filter>
  			<Filter
***************
*** 885,909 ****
  				>
  				<File
! 					RelativePath="..\Stackless\slp_platformselect.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\switch_ppc_macosx.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\switch_ppc_unix.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\switch_s390_unix.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\switch_sparc_sun_gcc.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\switch_x64_masm.asm"
  					>
  					<FileConfiguration
--- 605,637 ----
  				>
  				<File
! 					RelativePath="..\Stackless\platf\slp_platformselect.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\platf\slp_switch_stack.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\platf\switch_amd64_unix.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\platf\switch_ppc_macosx.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\platf\switch_ppc_unix.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\platf\switch_s390_unix.h"
! 					>
! 				</File>
! 				<File
! 					RelativePath="..\Stackless\platf\switch_sparc_sun_gcc.h"
! 					>
! 				</File>
! 				<File
! 					RelativePath="..\Stackless\platf\switch_x64_masm.asm"
  					>
  					<FileConfiguration
***************
*** 913,917 ****
  							Name="VCCustomBuildTool"
  							Description="assembling..."
! 							CommandLine="ml64 -c -Zi &quot;-Fl$(IntDir)\$(InputName).lst&quot; &quot;-Fo$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
  							Outputs="$(IntDir)\$(InputName).obj"
  						/>
--- 641,645 ----
  							Name="VCCustomBuildTool"
  							Description="assembling..."
! 							CommandLine="ml64 -c -Zi &quot;-Fl$(IntDir)\$(InputName).lst&quot; &quot;-Fo$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;"
  							Outputs="$(IntDir)\$(InputName).obj"
  						/>
***************
*** 923,927 ****
  							Name="VCCustomBuildTool"
  							Description="assembling..."
! 							CommandLine="ml64 -c -Zi &quot;-Fl$(IntDir)\$(InputName).lst&quot; &quot;-Fo$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
  							Outputs="$(IntDir)\$(InputName).obj"
  						/>
--- 651,655 ----
  							Name="VCCustomBuildTool"
  							Description="assembling..."
! 							CommandLine="ml64 -c -Zi &quot;-Fl$(IntDir)\$(InputName).lst&quot; &quot;-Fo$(IntDir)\$(InputName).obj&quot; &quot;$(InputPath)&quot;"
  							Outputs="$(IntDir)\$(InputName).obj"
  						/>
***************
*** 929,941 ****
  				</File>
  				<File
! 					RelativePath="..\Stackless\switch_x64_msvc.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\switch_x86_msvc.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\switch_x86_unix.h"
  					>
  				</File>
--- 657,669 ----
  				</File>
  				<File
! 					RelativePath="..\Stackless\platf\switch_x64_msvc.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\platf\switch_x86_msvc.h"
  					>
  				</File>
  				<File
! 					RelativePath="..\Stackless\platf\switch_x86_unix.h"
  					>
  				</File>


_______________________________________________
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