diff options
author | Christian Heimes <christian@cheimes.de> | 2007-12-31 16:14:33 (GMT) |
---|---|---|
committer | Christian Heimes <christian@cheimes.de> | 2007-12-31 16:14:33 (GMT) |
commit | 5b5e81c637eb115b27b4c5c66cf1cf348c706162 (patch) | |
tree | e83d0ce68e92750e40fbb901a0659bade6f41674 /PCbuild/python.vcproj | |
parent | 862543aa85249b46649b60da96743b4b14c6c83b (diff) | |
download | cpython-5b5e81c637eb115b27b4c5c66cf1cf348c706162.zip cpython-5b5e81c637eb115b27b4c5c66cf1cf348c706162.tar.gz cpython-5b5e81c637eb115b27b4c5c66cf1cf348c706162.tar.bz2 |
Merged revisions 59605-59624 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59606 | georg.brandl | 2007-12-29 11:57:00 +0100 (Sat, 29 Dec 2007) | 2 lines
Some cleanup in the docs.
........
r59611 | martin.v.loewis | 2007-12-29 19:49:21 +0100 (Sat, 29 Dec 2007) | 2 lines
Bug #1699: Define _BSD_SOURCE only on OpenBSD.
........
r59612 | raymond.hettinger | 2007-12-29 23:09:34 +0100 (Sat, 29 Dec 2007) | 1 line
Simpler documentation for itertools.tee(). Should be backported.
........
r59613 | raymond.hettinger | 2007-12-29 23:16:24 +0100 (Sat, 29 Dec 2007) | 1 line
Improve docs for itertools.groupby(). The use of xrange(0) to create a unique object is less obvious than object().
........
r59620 | christian.heimes | 2007-12-31 15:47:07 +0100 (Mon, 31 Dec 2007) | 3 lines
Added wininst-9.0.exe executable for VS 2008
Integrated bdist_wininst into PCBuild9 directory
........
r59621 | christian.heimes | 2007-12-31 15:51:18 +0100 (Mon, 31 Dec 2007) | 1 line
Moved PCbuild directory to PC/VS7.1
........
r59622 | christian.heimes | 2007-12-31 15:59:26 +0100 (Mon, 31 Dec 2007) | 1 line
Fix paths for build bot
........
r59623 | christian.heimes | 2007-12-31 16:02:41 +0100 (Mon, 31 Dec 2007) | 1 line
Fix paths for build bot, part 2
........
r59624 | christian.heimes | 2007-12-31 16:18:55 +0100 (Mon, 31 Dec 2007) | 1 line
Renamed PCBuild9 directory to PCBuild
........
Diffstat (limited to 'PCbuild/python.vcproj')
-rw-r--r-- | PCbuild/python.vcproj | 669 |
1 files changed, 520 insertions, 149 deletions
diff --git a/PCbuild/python.vcproj b/PCbuild/python.vcproj index 8412e81..17b29a2 100644 --- a/PCbuild/python.vcproj +++ b/PCbuild/python.vcproj @@ -1,273 +1,644 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="7.10" + Version="9,00" Name="python" - SccProjectName="python" - SccLocalPath=".."> + ProjectGUID="{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}" + TargetFrameworkVersion="131072" + > <Platforms> <Platform - Name="Win32"/> + Name="Win32" + /> + <Platform + Name="x64" + /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Release|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-release\python" ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - StringPooling="TRUE" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_CONSOLE" + StringPooling="true" RuntimeLibrary="2" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> + EnableFunctionLevelLinking="true" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" AdditionalDependencies="odbccp32.lib" - OutputFile=".\./python.exe" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./python.pdb" + OutputFile="$(OutDir)\python.exe" SubSystem="1" StackReserveSize="2000000" BaseAddress="0x1d000000" - TargetMachine="1"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > <Tool - Name="VCPreLinkEventTool"/> + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_CONSOLE" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" - Culture="1033"/> + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odbccp32.lib" + OutputFile="$(OutDir)\python.exe" + SubSystem="1" + StackReserveSize="2000000" + BaseAddress="0x1d000000" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration Name="Debug|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\x86-temp-debug\python" ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\debug.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + EnableIntrinsicFunctions="false" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_CONSOLE" RuntimeLibrary="3" - UsePrecompiledHeader="2" BrowseInformation="1" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + AdditionalIncludeDirectories="..\Include" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" AdditionalDependencies="odbccp32.lib" - OutputFile="./python_d.exe" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./python_d.pdb" + OutputFile="$(OutDir)\python_d.exe" SubSystem="1" StackReserveSize="2000000" BaseAddress="0x1d000000" - TargetMachine="1"/> + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\debug.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCXMLDataGeneratorTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCWebServiceProxyGeneratorTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + EnableIntrinsicFunctions="false" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_CONSOLE" + RuntimeLibrary="3" + BrowseInformation="1" + CompileAs="0" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCManagedResourceCompilerTool" + /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" - AdditionalIncludeDirectories="..\Include"/> + AdditionalIncludeDirectories="..\Include" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odbccp32.lib" + OutputFile="$(OutDir)\python_d.exe" + SubSystem="1" + StackReserveSize="2000000" + BaseAddress="0x1d000000" + /> + <Tool + Name="VCALinkTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCManifestTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseItanium|Win32" - OutputDirectory=".\." - IntermediateDirectory=".\ia64-temp-release\python" + Name="PGInstrument|Win32" ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pginstrument.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_ITANIUM /GS-" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - StringPooling="TRUE" - BasicRuntimeChecks="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_CONSOLE" + StringPooling="true" RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> + EnableFunctionLevelLinking="true" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK /VSEXTCOMP_VERBOSE" AdditionalDependencies="odbccp32.lib" - OutputFile=".\./python.exe" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./python.pdb" + OutputFile="$(OutDir)\python.exe" SubSystem="1" StackReserveSize="2000000" BaseAddress="0x1d000000" - TargetMachine="0"/> + ImportLibrary="" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> <Tool - Name="VCMIDLTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGInstrument|x64" + ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pginstrument.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > <Tool - Name="VCPreLinkEventTool"/> + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_CONSOLE" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" - Culture="1033"/> + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odbccp32.lib" + OutputFile="$(OutDir)\python.exe" + SubSystem="1" + StackReserveSize="2000000" + BaseAddress="0x1d000000" + ImportLibrary="" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration - Name="ReleaseAMD64|Win32" - OutputDirectory="." - IntermediateDirectory="amd64-temp-release\python" + Name="PGUpdate|Win32" ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pgupdate.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> <Tool Name="VCCLCompilerTool" - AdditionalOptions=" /USECL:MS_OPTERON" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\Include,..\PC" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - StringPooling="TRUE" - BasicRuntimeChecks="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_CONSOLE" + StringPooling="true" RuntimeLibrary="2" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="2" - WarningLevel="3" - SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> + EnableFunctionLevelLinking="true" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> <Tool - Name="VCCustomBuildTool"/> + Name="VCPreLinkEventTool" + /> <Tool Name="VCLinkerTool" - AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" AdditionalDependencies="odbccp32.lib" - OutputFile=".\./python.exe" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./python.pdb" + OutputFile="$(OutDir)\python.exe" SubSystem="1" StackReserveSize="2000000" BaseAddress="0x1d000000" - TargetMachine="0"/> + ImportLibrary="" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="PGUpdate|x64" + ConfigurationType="1" + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pgupdate.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > <Tool - Name="VCMIDLTool"/> + Name="VCPreBuildEventTool" + /> <Tool - Name="VCPostBuildEventTool"/> + Name="VCCustomBuildTool" + /> <Tool - Name="VCPreBuildEventTool"/> + Name="VCXMLDataGeneratorTool" + /> <Tool - Name="VCPreLinkEventTool"/> + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_CONSOLE" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" - Culture="1033"/> + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odbccp32.lib" + OutputFile="$(OutDir)\python.exe" + SubSystem="1" + StackReserveSize="2000000" + BaseAddress="0x1d000000" + ImportLibrary="" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> <Tool - Name="VCWebServiceProxyGeneratorTool"/> + Name="VCXDCMakeTool" + /> <Tool - Name="VCXMLDataGeneratorTool"/> + Name="VCBscMakeTool" + /> <Tool - Name="VCWebDeploymentTool"/> + Name="VCFxCopTool" + /> <Tool - Name="VCManagedWrapperGeneratorTool"/> + Name="VCAppVerifierTool" + /> <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References> </References> <Files> - <File - RelativePath="..\PC\pycon.ico"> - </File> - <File - RelativePath="..\Modules\python.c"> - </File> - <File - RelativePath="..\PC\python_exe.rc"> - </File> + <Filter + Name="Resource Files" + > + <File + RelativePath="..\PC\pycon.ico" + > + </File> + <File + RelativePath="..\PC\python_exe.rc" + > + </File> + </Filter> + <Filter + Name="Source Files" + > + <File + RelativePath="..\Modules\python.c" + > + </File> + </Filter> </Files> <Globals> </Globals> |