Skip to content

C
cpython
Commit b15a0ccf authored by Kristján Valur Jónsson's avatar Kristján Valur Jónsson
Browse files
Options

Update the PCBuild8 solution. 

Facilitate cross-compilation by having binaries in separate Win32 and x64 directories.
Rationalized configs by making proper use of platforms/configurations.
Remove pythoncore_pgo project.
Add new PGIRelease and PGORelease configurations to perform Profile Guided Optimisation.
Removed I64 support, but this can be easily added by copying the x64 platform settings.
parent e6728252
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1815 additions and 1869 deletions
PC/example_nt/example.vcproj
View file @ b15a0ccf
......@@ -39,7 +39,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/export:initexample"
AdditionalDependencies="odbc32.lib odbccp32.lib python25.lib"
AdditionalDependencies="odbc32.lib odbccp32.lib python26.lib"
OutputFile=".\Release/example.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
......@@ -105,7 +105,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/export:initexample"
AdditionalDependencies="odbc32.lib odbccp32.lib python25_d.lib"
AdditionalDependencies="odbc32.lib odbccp32.lib python26_d.lib"
OutputFile=".\Debug/example_d.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
......
PCbuild8/_ctypes.vcproj
View file @ b15a0ccf
......@@ -4,20 +4,24 @@
Version="8,00"
Name="_ctypes"
ProjectGUID="{F22F40F4-D318-40DC-96B3-88DC81CE0894}"
RootNamespace="_ctypes"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
<Platform
Name="x64"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\."
IntermediateDirectory=".\x86-temp-debug\_ctypes"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_ctypes"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
......@@ -63,14 +67,15 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
OutputFile="./_ctypes_d.pyd"
OutputFile="$(OutDir)\_ctypes_d.pyd"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\./_ctypes_d.pdb"
ProgramDatabaseFile=""
SubSystem="0"
BaseAddress="0x1D1A0000"
ImportLibrary=".\./_ctypes_d.lib"
ImportLibrary=""
TargetMachine="1"
/>
<Tool
......@@ -99,9 +104,9 @@
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\."
IntermediateDirectory=".\x86-temp-release\_ctypes"
Name="Debug|x64"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_ctypes"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
......@@ -120,19 +125,20 @@
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
Optimization="0"
AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\_ctypes\libffi_msvc"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="false"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="0"
DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
......@@ -147,17 +153,16 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
OutputFile="./_ctypes.pyd"
OutputFile="$(OutDir)\_ctypes_d.pyd"
LinkIncremental="1"
SuppressStartupBanner="true"
GenerateDebugInformation="false"
ProgramDatabaseFile=".\./_ctypes.pdb"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile=""
SubSystem="0"
OptimizeReferences="0"
EnableCOMDATFolding="0"
BaseAddress="0x1D1A0000"
ImportLibrary=".\./_ctypes.lib"
TargetMachine="1"
ImportLibrary=""
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
......@@ -185,9 +190,9 @@
/>
</Configuration>
<Configuration
Name="ReleaseAMD64|Win32"
OutputDirectory="."
IntermediateDirectory="amd64-temp-release\_ctypes"
Name="Release|Win32"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_ctypes"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
......@@ -209,19 +214,16 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_OPTERON"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\_ctypes\libffi_msvc"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="true"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="0"
CompileAs="0"
/>
<Tool
......@@ -235,18 +237,19 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
OutputFile="./_ctypes.pyd"
AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
OutputFile="$(OutDir)\_ctypes.pyd"
LinkIncremental="1"
SuppressStartupBanner="true"
GenerateDebugInformation="false"
ProgramDatabaseFile=".\./_ctypes.pdb"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile=""
SubSystem="0"
OptimizeReferences="0"
EnableCOMDATFolding="0"
BaseAddress="0x1D1A0000"
ImportLibrary=".\./_ctypes.lib"
TargetMachine="0"
ImportLibrary=""
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
......@@ -274,9 +277,9 @@
/>
</Configuration>
<Configuration
Name="ReleaseItanium|Win32"
OutputDirectory="."
IntermediateDirectory="ia64-temp-release\_ctypes"
Name="Release|x64"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_ctypes"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
......@@ -295,22 +298,20 @@
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_ITANIUM"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\_ctypes\libffi_msvc"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="true"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="0"
CompileAs="0"
/>
<Tool
......@@ -324,18 +325,19 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
OutputFile="./_ctypes.pyd"
AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
OutputFile="$(OutDir)\_ctypes.pyd"
LinkIncremental="1"
SuppressStartupBanner="true"
GenerateDebugInformation="false"
ProgramDatabaseFile=".\./_ctypes.pdb"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile=""
SubSystem="0"
OptimizeReferences="0"
EnableCOMDATFolding="0"
BaseAddress="0x1D1A0000"
ImportLibrary=".\./_ctypes.lib"
TargetMachine="0"
ImportLibrary=""
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
......
PCbuild8/_ctypes_test.vcproj
View file @ b15a0ccf
......@@ -4,20 +4,24 @@
Version="8,00"
Name="_ctypes_test"
ProjectGUID="{8CF334D9-4F82-42EB-97AF-83592C5AFD2F}"
RootNamespace="_ctypes_test"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
<Platform
Name="x64"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\."
IntermediateDirectory=".\x86-temp-debug\_ctypes_test"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_ctypes_test"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
......@@ -62,13 +66,14 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="./_ctypes_test_d.pyd"
OutputFile="$(OutDir)\_ctypes_test_d.pyd"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\./_ctypes_test_d.pdb"
ProgramDatabaseFile=""
SubSystem="0"
ImportLibrary=".\./_ctypes_test_d.lib"
ImportLibrary=""
TargetMachine="1"
/>
<Tool
......@@ -97,9 +102,9 @@
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\."
IntermediateDirectory=".\x86-temp-release\_ctypes_test"
Name="Debug|x64"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_ctypes_test"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
......@@ -118,19 +123,20 @@
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
Optimization="0"
AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="false"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="0"
DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
......@@ -144,16 +150,15 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="./_ctypes_test.pyd"
OutputFile="$(OutDir)/_ctypes_test_d.pyd"
LinkIncremental="1"
SuppressStartupBanner="true"
GenerateDebugInformation="false"
ProgramDatabaseFile=".\./_ctypes_test.pdb"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile=""
SubSystem="0"
OptimizeReferences="0"
EnableCOMDATFolding="0"
ImportLibrary=".\./_ctypes_test.lib"
TargetMachine="1"
ImportLibrary=""
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
......@@ -181,9 +186,9 @@
/>
</Configuration>
<Configuration
Name="ReleaseItanium|Win32"
OutputDirectory="."
IntermediateDirectory="ia64-temp-release\_ctypes_test"
Name="Release|Win32"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_ctypes_test"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
......@@ -205,18 +210,16 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_ITANIUM"
Optimization="0"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="false"
BasicRuntimeChecks="0"
RuntimeLibrary="3"
BufferSecurityCheck="false"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
DebugInformationFormat="0"
CompileAs="0"
/>
<Tool
......@@ -230,15 +233,17 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
OutputFile="./_ctypes_test_d.pyd"
OutputFile="$(OutDir)\_ctypes_test.pyd"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\./_ctypes_test_d.pdb"
ProgramDatabaseFile=""
SubSystem="0"
ImportLibrary=".\./_ctypes_test_d.lib"
TargetMachine="0"
OptimizeReferences="0"
EnableCOMDATFolding="0"
ImportLibrary=""
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
......@@ -266,9 +271,9 @@
/>
</Configuration>
<Configuration
Name="ReleaseAMD64|Win32"
OutputDirectory="."
IntermediateDirectory="amd64-temp-release\_ctypes_test"
Name="Release|x64"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_ctypes_test"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
......@@ -287,22 +292,20 @@
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_OPTERON"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="true"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
DebugInformationFormat="0"
CompileAs="0"
/>
<Tool
......@@ -316,17 +319,17 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
OutputFile="./_ctypes_test.pyd"
OutputFile="$(OutDir)\_ctypes_test.pyd"
LinkIncremental="1"
SuppressStartupBanner="true"
GenerateDebugInformation="false"
ProgramDatabaseFile=".\./_ctypes_test.pdb"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile=""
SubSystem="0"
OptimizeReferences="0"
EnableCOMDATFolding="0"
ImportLibrary=".\./_ctypes_test.lib"
TargetMachine="0"
ImportLibrary=""
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
......
PCbuild8/_elementtree.vcproj
View file @ b15a0ccf
......@@ -4,19 +4,23 @@
Version="8,00"
Name="_elementtree"
ProjectGUID="{1966DDE2-4AB7-4E4E-ACC9-C121E4D37F8E}"
RootNamespace="_elementtree"
>
<Platforms>
<Platform
Name="Win32"
/>
<Platform
Name="x64"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\."
IntermediateDirectory=".\x86-temp-debug\_elementtree"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_elementtree"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
......@@ -61,14 +65,15 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
OutputFile="./_elementtree_d.pyd"
OutputFile="$(OutDir)\_elementtree_d.pyd"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\./_elementtree_d.pdb"
ProgramDatabaseFile=""
SubSystem="2"
BaseAddress="0x1D100000"
ImportLibrary=".\./_elementtree_d.lib"
ImportLibrary=""
TargetMachine="1"
/>
<Tool
......@@ -97,9 +102,9 @@
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\."
IntermediateDirectory=".\x86-temp-release\_elementtree"
Name="Debug|x64"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_elementtree"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
......@@ -119,16 +124,14 @@
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
Optimization="0"
AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
PreprocessorDefinitions="_DEBUG;HAVE_EXPAT_H;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
SuppressStartupBanner="true"
......@@ -147,15 +150,16 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
OutputFile="./_elementtree.pyd"
OutputFile="$(OutDir)\_elementtree_d.pyd"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\./_elementtree.pdb"
ProgramDatabaseFile=""
SubSystem="2"
BaseAddress="0x1D100000"
ImportLibrary=".\./_elementtree.lib"
TargetMachine="1"
ImportLibrary=""
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
......@@ -183,9 +187,9 @@
/>
</Configuration>
<Configuration
Name="ReleaseItanium|Win32"
OutputDirectory="./."
IntermediateDirectory=".\ia64-temp-release\_elementtree"
Name="Release|Win32"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_elementtree"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
......@@ -208,20 +212,16 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_ITANIUM"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
StringPooling="true"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CompileAs="0"
/>
......@@ -236,17 +236,17 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
AdditionalDependencies="odbccp32.lib"
OutputFile="./_elementtree.pyd"
OutputFile="$(OutDir)\_elementtree.pyd"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\./_elementtree.pdb"
ProgramDatabaseFile=""
SubSystem="2"
BaseAddress="0x1D100000"
ImportLibrary=".\./_elementtree.lib"
TargetMachine="0"
ImportLibrary=""
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
......@@ -274,9 +274,9 @@
/>
</Configuration>
<Configuration
Name="ReleaseAMD64|Win32"
OutputDirectory="."
IntermediateDirectory="amd64-temp-release\_elementtree"
Name="Release|x64"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_elementtree"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
......@@ -296,23 +296,21 @@
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_OPTERON /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC,..\Modules\expat"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
StringPooling="true"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CompileAs="0"
/>
......@@ -327,17 +325,17 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
AdditionalDependencies="odbccp32.lib"
OutputFile="./_elementtree.pyd"
OutputFile="$(OutDir)\_elementtree.pyd"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\./_elementtree.pdb"
ProgramDatabaseFile=""
SubSystem="2"
BaseAddress="0x1D100000"
ImportLibrary=".\./_elementtree.lib"
TargetMachine="0"
ImportLibrary=""
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
......
PCbuild8/_msi.vcproj
View file @ b15a0ccf
......@@ -4,19 +4,23 @@
Version="8,00"
Name="_msi"
ProjectGUID="{2C0BEFB9-70E2-4F80-AC5B-4AB8EE023574}"
RootNamespace="_msi"
>
<Platforms>
<Platform
Name="Win32"
/>
<Platform
Name="x64"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\."
IntermediateDirectory=".\x86-temp-debug\_msi"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_msi"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
......@@ -63,13 +67,14 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
OutputFile="./_msi.pyd"
OutputFile="$(OutDir)\_msi.pyd"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\./_msi.pdb"
ProgramDatabaseFile=""
BaseAddress="0x1D160000"
ImportLibrary=".\./_msi.lib"
ImportLibrary=""
TargetMachine="1"
/>
<Tool
......@@ -98,9 +103,9 @@
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\."
IntermediateDirectory=".\x86-temp-release\_msi"
Name="Debug|x64"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_msi"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
......@@ -121,19 +126,19 @@
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
Optimization="0"
AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
......@@ -148,13 +153,15 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
OutputFile="./_msi.pyd"
OutputFile="$(OutDir)\_msi.pyd"
LinkIncremental="1"
SuppressStartupBanner="true"
ProgramDatabaseFile=".\./_msi.pdb"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile=""
BaseAddress="0x1D160000"
ImportLibrary=".\./_msi.lib"
TargetMachine="1"
ImportLibrary=""
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
......@@ -182,9 +189,9 @@
/>
</Configuration>
<Configuration
Name="ReleaseItanium|Win32"
OutputDirectory=".\."
IntermediateDirectory=".\ia64-temp-release\_msi"
Name="Release|Win32"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_msi"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
......@@ -208,21 +215,16 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_ITANIUM"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
StringPooling="true"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
......@@ -236,15 +238,16 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
OutputFile="./_msi.pyd"
OutputFile="$(OutDir)\_msi.pyd"
LinkIncremental="1"
SuppressStartupBanner="true"
ProgramDatabaseFile=".\./_msi.pdb"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile=""
BaseAddress="0x1D160000"
ImportLibrary=".\./_msi.lib"
TargetMachine="0"
ImportLibrary=""
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
......@@ -272,9 +275,9 @@
/>
</Configuration>
<Configuration
Name="ReleaseAMD64|Win32"
OutputDirectory="."
IntermediateDirectory="amd64-temp-release\_msi"
Name="Release|x64"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_msi"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
......@@ -295,24 +298,20 @@
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_OPTERON /GS-"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
StringPooling="true"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
......@@ -326,15 +325,16 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
AdditionalDependencies="fci.lib msi.lib rpcrt4.lib bufferoverflowU.lib"
OutputFile="./_msi.pyd"
AdditionalDependencies="fci.lib msi.lib rpcrt4.lib"
OutputFile="$(OutDir)\_msi.pyd"
LinkIncremental="1"
SuppressStartupBanner="true"
ProgramDatabaseFile=".\./_msi.pdb"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile=""
BaseAddress="0x1D160000"
ImportLibrary=".\./_msi.lib"
TargetMachine="0"
ImportLibrary=""
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
......
PCbuild8/_sqlite3.vcproj
View file @ b15a0ccf
......@@ -4,19 +4,23 @@
Version="8,00"
Name="_sqlite3"
ProjectGUID="{2FF0A312-22F9-4C34-B070-842916DE27A9}"
RootNamespace="_sqlite3"
>
<Platforms>
<Platform
Name="Win32"
/>
<Platform
Name="x64"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\."
IntermediateDirectory=".\x86-temp-debug\_sqlite3"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_sqlite3"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
......@@ -61,15 +65,16 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="..\..\sqlite-source-3.3.4\sqlite3.lib"
OutputFile="./_sqlite3_d.pyd"
OutputFile="$(OutDir)\_sqlite3_d.pyd"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
ProgramDatabaseFile=".\./_sqlite3_d.pdb"
ProgramDatabaseFile=""
SubSystem="2"
BaseAddress="0x1e180000"
ImportLibrary=".\./_sqlite3_d.lib"
ImportLibrary=""
TargetMachine="1"
/>
<Tool
......@@ -98,9 +103,9 @@
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\."
IntermediateDirectory=".\x86-temp-release\_sqlite3"
Name="Debug|x64"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_sqlite"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
......@@ -120,16 +125,14 @@
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
Optimization="0"
AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;MODULE_NAME=\&quot;sqlite3\&quot;"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;MODULE_NAME=\&quot;sqlite3\&quot;"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
SuppressStartupBanner="true"
......@@ -148,16 +151,17 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="..\..\sqlite-source-3.3.4\sqlite3.lib"
OutputFile="./_sqlite3.pyd"
OutputFile="$(OutDir)\_sqlite3_d.pyd"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
ProgramDatabaseFile=".\./_sqlite3.pdb"
ProgramDatabaseFile=""
SubSystem="2"
BaseAddress="0x1e180000"
ImportLibrary=".\./_sqlite3.lib"
TargetMachine="1"
ImportLibrary=""
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
......@@ -185,9 +189,9 @@
/>
</Configuration>
<Configuration
Name="ReleaseItanium|Win32"
OutputDirectory="./."
IntermediateDirectory=".\ia64-temp-release\_sqlite3"
Name="Release|Win32"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_sqlite3"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
......@@ -210,20 +214,16 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_ITANIUM"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;MODULE_NAME=\&quot;sqlite3\&quot;"
StringPooling="true"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CompileAs="0"
/>
......@@ -238,18 +238,18 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
AdditionalDependencies="..\..\sqlite-source-3.3.4\ia64\sqlite3.lib"
OutputFile="./_sqlite3.pyd"
AdditionalDependencies="..\..\sqlite-source-3.3.4\sqlite3.lib"
OutputFile="$(OutDir)\_sqlite3.pyd"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
ProgramDatabaseFile=".\./_sqlite3.pdb"
ProgramDatabaseFile=""
SubSystem="2"
BaseAddress="0x1e180000"
ImportLibrary=".\./_sqlite3.lib"
TargetMachine="0"
ImportLibrary=""
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
......@@ -277,9 +277,9 @@
/>
</Configuration>
<Configuration
Name="ReleaseAMD64|Win32"
OutputDirectory="."
IntermediateDirectory="amd64-temp-release\_sqlite3"
Name="Release|x64"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\_sqlite3"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
......@@ -299,23 +299,20 @@
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_OPTERON"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include;..\PC;..\..\sqlite-source-3.3.4"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;MODULE_NAME=\&quot;sqlite3\&quot;"
StringPooling="true"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CompileAs="0"
/>
......@@ -330,18 +327,18 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
AdditionalDependencies="..\..\sqlite-source-3.3.4\amd64\sqlite3.lib"
OutputFile="./_sqlite3.pyd"
AdditionalDependencies="..\..\sqlite-source-3.3.4\sqlite3.lib"
OutputFile="$(OutDir)\_sqlite3.pyd"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
ProgramDatabaseFile=".\./_sqlite3.pdb"
ProgramDatabaseFile=""
SubSystem="2"
BaseAddress="0x1e180000"
ImportLibrary=".\./_sqlite3.lib"
TargetMachine="0"
ImportLibrary=""
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
......
PCbuild8/make_buildinfo.c
View file @ b15a0ccf
......@@ -3,19 +3,23 @@
#include <sys/stat.h>
#include <stdio.h>
/* This file creates the getbuildinfo.o object, by first
invoking subwcrev.exe (if found), and then invoking cl.exe.
As a side effect, it might generate PCBuild\getbuildinfo2.c
also. If this isn't a subversion checkout, or subwcrev isn't
found, it compiles ..\\Modules\\getbuildinfo.c instead.
/* This file creates the getbuildinfo2.c file, by
invoking subwcrev.exe (if found).
If this isn't a subversion checkout, or subwcrev isn't
found, it copies ..\\Modules\\getbuildinfo.c instead.
A file, getbuildinfo2.h is then updated to define
SUBWCREV if it was a subversion checkout.
getbuildinfo2.c is part of the pythoncore project with
getbuildinfo2.h as a forced include. This helps
VisualStudio refrain from unnecessary compiles much of the
time.
Currently, subwcrev.exe is found from the registry entries
of TortoiseSVN.
No attempt is made to place getbuildinfo.o into the proper
binary directory. This isn't necessary, as this tool is
invoked as a pre-link step for pythoncore, so that overwrites
any previous getbuildinfo.o.
make_buildinfo.exe is called as a pre-build step for pythoncore.
*/
......@@ -40,11 +44,11 @@ int make_buildinfo2()
type != REG_SZ)
/* Registry corrupted */
return 0;
strcat(command, "bin\\subwcrev.exe");
strcat_s(command, sizeof(command), "bin\\subwcrev.exe");
if (_stat(command+1, &st) < 0)
/* subwcrev.exe not part of the release */
return 0;
strcat(command, "\" .. ..\\Modules\\getbuildinfo.c getbuildinfo2.c");
strcat_s(command, sizeof(command), "\" .. ..\\Modules\\getbuildinfo.c getbuildinfo2.c");
puts(command); fflush(stdout);
if (system(command) < 0)
return 0;
......@@ -53,40 +57,25 @@ int make_buildinfo2()
int main(int argc, char*argv[])
{
char command[500] = "cl.exe -c -D_WIN32 -DUSE_DL_EXPORT -D_WINDOWS -DWIN32 -D_WINDLL ";
int do_unlink, result;
if (argc != 2) {
fprintf(stderr, "make_buildinfo $(ConfigurationName)\n");
return EXIT_FAILURE;
}
if (strcmp(argv[1], "Release") == 0) {
strcat(command, "-MD ");
}
else if (strcmp(argv[1], "Debug") == 0) {
strcat(command, "-D_DEBUG -MDd ");
}
else if (strcmp(argv[1], "ReleaseItanium") == 0) {
strcat(command, "-MD /USECL:MS_ITANIUM ");
}
else if (strcmp(argv[1], "ReleaseAMD64") == 0) {
strcat(command, "-MD ");
strcat(command, "-MD /USECL:MS_OPTERON ");
}
else {
fprintf(stderr, "unsupported configuration %s\n", argv[1]);
return EXIT_FAILURE;
}
char command[500] = "";
int svn;
FILE *f;
if ((do_unlink = make_buildinfo2()))
strcat(command, "getbuildinfo2.c -DSUBWCREV ");
else
strcat(command, "..\\Modules\\getbuildinfo.c");
strcat(command, " -Fogetbuildinfo.o -I..\\Include -I..\\PC");
puts(command); fflush(stdout);
result = system(command);
if (do_unlink)
unlink("getbuildinfo2.c");
if (result < 0)
if (fopen_s(&f, "getbuildinfo2.h", "w"))
return EXIT_FAILURE;
/* Get getbuildinfo.c from svn as getbuildinfo2.c */
svn = make_buildinfo2();
if (svn) {
puts("got getbuildinfo2.c from svn. Updating getbuildinfo2.h");
/* yes. make sure SUBWCREV is defined */
fprintf(f, "#define SUBWCREV\n");
} else {
puts("didn't get getbuildinfo2.c from svn. Copying from Modules and clearing getbuildinfo2.h");
strcat_s(command, sizeof(command), "copy ..\\Modules\\getbuildinfo.c getbuildinfo2.c");
puts(command); fflush(stdout);
if (system(command) < 0)
return EXIT_FAILURE;
}
fclose(f);
return 0;
}
\ No newline at end of file
PCbuild8/make_buildinfo.vcproj
View file @ b15a0ccf
......@@ -4,6 +4,7 @@
Version="8,00"
Name="make_buildinfo"
ProjectGUID="{C73F0EC1-358B-4177-940F-0846AC8B04CD}"
RootNamespace="make_buildinfo"
Keyword="Win32Proj"
>
<Platforms>
......@@ -40,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
......@@ -90,82 +91,8 @@
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="."
IntermediateDirectory=".\x86-temp-release\make_buildinfo"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)/make_buildinfo.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
Description="Making getbuildinfo2.c"
CommandLine="$(TargetPath)"
/>
</Configuration>
</Configurations>
......
PCbuild8/pcbuild.sln
View file @ b15a0ccf
This diff is collapsed.
PCbuild8/python.vcproj
View file @ b15a0ccf
......@@ -4,19 +4,23 @@
Version="8,00"
Name="python"
ProjectGUID="{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}"
RootNamespace="python"
>
<Platforms>
<Platform
Name="Win32"
/>
<Platform
Name="x64"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Release|Win32"
OutputDirectory=".\."
IntermediateDirectory=".\x86-temp-release\python"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\python"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
......@@ -67,11 +71,12 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
OutputFile=".\./python.exe"
OutputFile="$(OutDir)\python.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\./python.pdb"
ProgramDatabaseFile=""
SubSystem="1"
StackReserveSize="2000000"
BaseAddress="0x1d000000"
......@@ -103,9 +108,9 @@
/>
</Configuration>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\."
IntermediateDirectory=".\x86-temp-debug\python"
Name="Release|x64"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\python"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
......@@ -126,15 +131,18 @@
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
RuntimeLibrary="3"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="3"
......@@ -145,9 +153,8 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
AdditionalIncludeDirectories="..\Include"
/>
<Tool
Name="VCPreLinkEventTool"
......@@ -155,15 +162,16 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbccp32.lib"
OutputFile="./python_d.exe"
OutputFile="$(OutDir)\python.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\./python_d.pdb"
ProgramDatabaseFile=""
SubSystem="1"
StackReserveSize="2000000"
BaseAddress="0x1d000000"
TargetMachine="1"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
......@@ -191,9 +199,9 @@
/>
</Configuration>
<Configuration
Name="ReleaseItanium|Win32"
OutputDirectory=".\."
IntermediateDirectory=".\ia64-temp-release\python"
Name="Debug|Win32"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\python"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
......@@ -217,20 +225,14 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_ITANIUM /VSEXTCOMP_VERBOSE"
Optimization="2"
InlineFunctionExpansion="1"
Optimization="0"
AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CompileAs="0"
/>
......@@ -239,25 +241,26 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
AdditionalIncludeDirectories="..\Include"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK /VSEXTCOMP_VERBOSE"
AdditionalDependencies="odbccp32.lib"
OutputFile=".\./python.exe"
OutputFile="$(OutDir)\python_d.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\./python.pdb"
ProgramDatabaseFile=""
SubSystem="1"
StackReserveSize="2000000"
BaseAddress="0x1d000000"
TargetMachine="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
......@@ -285,9 +288,9 @@
/>
</Configuration>
<Configuration
Name="ReleaseAMD64|Win32"
OutputDirectory="."
IntermediateDirectory="amd64-temp-release\python"
Name="Debug|x64"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\python"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
......@@ -308,23 +311,18 @@
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_OPTERON"
Optimization="2"
InlineFunctionExpansion="1"
Optimization="0"
AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CompileAs="0"
/>
......@@ -333,25 +331,26 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
AdditionalIncludeDirectories="..\Include"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
AdditionalDependencies="odbccp32.lib"
OutputFile=".\./python.exe"
AdditionalDependencies="odbccp32.lib python26_d.lib"
OutputFile="$(OutDir)\python_d.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\./python.pdb"
ProgramDatabaseFile=""
SubSystem="1"
StackReserveSize="2000000"
BaseAddress="0x1d000000"
TargetMachine="0"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
......
PCbuild8/pythoncore.vcproj
View file @ b15a0ccf
This diff is collapsed.
PCbuild8/pythoncore_pgo.vcproj deleted 100644 → 0
View file @ e6728252
This diff is collapsed.
PCbuild8/pythoncore_pgo_link.txt deleted 100644 → 0
View file @ e6728252
/OUT:".\pythoncore_pgo/python25.dll" /INCREMENTAL:NO /DLL /MANIFEST /MANIFESTFILE:".\x86-temp-release\pythoncore_pgo\python25.dll.intermediate.manifest" /NODEFAULTLIB:"libc" /DEBUG /PDB:".\pythoncore_pgo/python25.pdb" /SUBSYSTEM:WINDOWS /LTCG:PGINSTRUMENT /PGD:".\pythoncore_pgo\python25.pgd" /BASE:"0x1e000000" /IMPLIB:"pythoncore_pgo/python25.lib" /MACHINE:X86 getbuildinfo.o kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
".\x86-temp-release\pythoncore_pgo\adler32.obj"
".\x86-temp-release\pythoncore_pgo\compress.obj"
".\x86-temp-release\pythoncore_pgo\crc32.obj"
".\x86-temp-release\pythoncore_pgo\deflate.obj"
".\x86-temp-release\pythoncore_pgo\gzio.obj"
".\x86-temp-release\pythoncore_pgo\infback.obj"
".\x86-temp-release\pythoncore_pgo\inffast.obj"
".\x86-temp-release\pythoncore_pgo\inflate.obj"
".\x86-temp-release\pythoncore_pgo\inftrees.obj"
".\x86-temp-release\pythoncore_pgo\trees.obj"
".\x86-temp-release\pythoncore_pgo\uncompr.obj"
".\x86-temp-release\pythoncore_pgo\zlibmodule.obj"
".\x86-temp-release\pythoncore_pgo\zutil.obj"
".\x86-temp-release\pythoncore_pgo\_bisectmodule.obj"
".\x86-temp-release\pythoncore_pgo\_codecs_cn.obj"
".\x86-temp-release\pythoncore_pgo\_codecs_hk.obj"
".\x86-temp-release\pythoncore_pgo\_codecs_iso2022.obj"
".\x86-temp-release\pythoncore_pgo\_codecs_jp.obj"
".\x86-temp-release\pythoncore_pgo\_codecs_kr.obj"
".\x86-temp-release\pythoncore_pgo\_codecs_tw.obj"
".\x86-temp-release\pythoncore_pgo\_codecsmodule.obj"
".\x86-temp-release\pythoncore_pgo\_csv.obj"
".\x86-temp-release\pythoncore_pgo\_functoolsmodule.obj"
".\x86-temp-release\pythoncore_pgo\_heapqmodule.obj"
".\x86-temp-release\pythoncore_pgo\_hotshot.obj"
".\x86-temp-release\pythoncore_pgo\_localemodule.obj"
".\x86-temp-release\pythoncore_pgo\_lsprof.obj"
".\x86-temp-release\pythoncore_pgo\_randommodule.obj"
".\x86-temp-release\pythoncore_pgo\_sre.obj"
".\x86-temp-release\pythoncore_pgo\_struct.obj"
".\x86-temp-release\pythoncore_pgo\_subprocess.obj"
".\x86-temp-release\pythoncore_pgo\_weakref.obj"
".\x86-temp-release\pythoncore_pgo\_winreg.obj"
".\x86-temp-release\pythoncore_pgo\abstract.obj"
".\x86-temp-release\pythoncore_pgo\acceler.obj"
".\x86-temp-release\pythoncore_pgo\arraymodule.obj"
".\x86-temp-release\pythoncore_pgo\asdl.obj"
".\x86-temp-release\pythoncore_pgo\ast.obj"
".\x86-temp-release\pythoncore_pgo\audioop.obj"
".\x86-temp-release\pythoncore_pgo\binascii.obj"
".\x86-temp-release\pythoncore_pgo\bitset.obj"
".\x86-temp-release\pythoncore_pgo\bltinmodule.obj"
".\x86-temp-release\pythoncore_pgo\boolobject.obj"
".\x86-temp-release\pythoncore_pgo\bufferobject.obj"
".\x86-temp-release\pythoncore_pgo\cellobject.obj"
".\x86-temp-release\pythoncore_pgo\ceval.obj"
".\x86-temp-release\pythoncore_pgo\classobject.obj"
".\x86-temp-release\pythoncore_pgo\cmathmodule.obj"
".\x86-temp-release\pythoncore_pgo\cobject.obj"
".\x86-temp-release\pythoncore_pgo\codecs.obj"
".\x86-temp-release\pythoncore_pgo\codeobject.obj"
".\x86-temp-release\pythoncore_pgo\collectionsmodule.obj"
".\x86-temp-release\pythoncore_pgo\compile.obj"
".\x86-temp-release\pythoncore_pgo\complexobject.obj"
".\x86-temp-release\pythoncore_pgo\config.obj"
".\x86-temp-release\pythoncore_pgo\cPickle.obj"
".\x86-temp-release\pythoncore_pgo\cStringIO.obj"
".\x86-temp-release\pythoncore_pgo\datetimemodule.obj"
".\x86-temp-release\pythoncore_pgo\descrobject.obj"
".\x86-temp-release\pythoncore_pgo\dictobject.obj"
".\x86-temp-release\pythoncore_pgo\dl_nt.obj"
".\x86-temp-release\pythoncore_pgo\dynload_win.obj"
".\x86-temp-release\pythoncore_pgo\enumobject.obj"
".\x86-temp-release\pythoncore_pgo\errnomodule.obj"
".\x86-temp-release\pythoncore_pgo\errors.obj"
".\x86-temp-release\pythoncore_pgo\exceptions.obj"
".\x86-temp-release\pythoncore_pgo\fileobject.obj"
".\x86-temp-release\pythoncore_pgo\firstsets.obj"
".\x86-temp-release\pythoncore_pgo\floatobject.obj"
".\x86-temp-release\pythoncore_pgo\frameobject.obj"
".\x86-temp-release\pythoncore_pgo\frozen.obj"
".\x86-temp-release\pythoncore_pgo\funcobject.obj"
".\x86-temp-release\pythoncore_pgo\future.obj"
".\x86-temp-release\pythoncore_pgo\gcmodule.obj"
".\x86-temp-release\pythoncore_pgo\genobject.obj"
".\x86-temp-release\pythoncore_pgo\getargs.obj"
".\x86-temp-release\pythoncore_pgo\getcompiler.obj"
".\x86-temp-release\pythoncore_pgo\getcopyright.obj"
".\x86-temp-release\pythoncore_pgo\getmtime.obj"
".\x86-temp-release\pythoncore_pgo\getopt.obj"
".\x86-temp-release\pythoncore_pgo\getpathp.obj"
".\x86-temp-release\pythoncore_pgo\getplatform.obj"
".\x86-temp-release\pythoncore_pgo\getversion.obj"
".\x86-temp-release\pythoncore_pgo\graminit.obj"
".\x86-temp-release\pythoncore_pgo\grammar.obj"
".\x86-temp-release\pythoncore_pgo\grammar1.obj"
".\x86-temp-release\pythoncore_pgo\imageop.obj"
".\x86-temp-release\pythoncore_pgo\import.obj"
".\x86-temp-release\pythoncore_pgo\import_nt.obj"
".\x86-temp-release\pythoncore_pgo\importdl.obj"
".\x86-temp-release\pythoncore_pgo\intobject.obj"
".\x86-temp-release\pythoncore_pgo\iterobject.obj"
".\x86-temp-release\pythoncore_pgo\itertoolsmodule.obj"
".\x86-temp-release\pythoncore_pgo\listnode.obj"
".\x86-temp-release\pythoncore_pgo\listobject.obj"
".\x86-temp-release\pythoncore_pgo\longobject.obj"
".\x86-temp-release\pythoncore_pgo\main.obj"
".\x86-temp-release\pythoncore_pgo\marshal.obj"
".\x86-temp-release\pythoncore_pgo\mathmodule.obj"
".\x86-temp-release\pythoncore_pgo\md5.obj"
".\x86-temp-release\pythoncore_pgo\md5module.obj"
".\x86-temp-release\pythoncore_pgo\metagrammar.obj"
".\x86-temp-release\pythoncore_pgo\methodobject.obj"
".\x86-temp-release\pythoncore_pgo\mmapmodule.obj"
".\x86-temp-release\pythoncore_pgo\modsupport.obj"
".\x86-temp-release\pythoncore_pgo\moduleobject.obj"
".\x86-temp-release\pythoncore_pgo\msvcrtmodule.obj"
".\x86-temp-release\pythoncore_pgo\multibytecodec.obj"
".\x86-temp-release\pythoncore_pgo\myreadline.obj"
".\x86-temp-release\pythoncore_pgo\mysnprintf.obj"
".\x86-temp-release\pythoncore_pgo\mystrtoul.obj"
".\x86-temp-release\pythoncore_pgo\node.obj"
".\x86-temp-release\pythoncore_pgo\object.obj"
".\x86-temp-release\pythoncore_pgo\obmalloc.obj"
".\x86-temp-release\pythoncore_pgo\operator.obj"
".\x86-temp-release\pythoncore_pgo\parser.obj"
".\x86-temp-release\pythoncore_pgo\parsermodule.obj"
".\x86-temp-release\pythoncore_pgo\parsetok.obj"
".\x86-temp-release\pythoncore_pgo\posixmodule.obj"
".\x86-temp-release\pythoncore_pgo\pyarena.obj"
".\x86-temp-release\pythoncore_pgo\pyfpe.obj"
".\x86-temp-release\pythoncore_pgo\pystate.obj"
".\x86-temp-release\pythoncore_pgo\pystrtod.obj"
".\x86-temp-release\pythoncore_pgo\Python-ast.obj"
".\x86-temp-release\pythoncore_pgo\python_nt.res"
".\x86-temp-release\pythoncore_pgo\pythonrun.obj"
".\x86-temp-release\pythoncore_pgo\rangeobject.obj"
".\x86-temp-release\pythoncore_pgo\rgbimgmodule.obj"
".\x86-temp-release\pythoncore_pgo\rotatingtree.obj"
".\x86-temp-release\pythoncore_pgo\setobject.obj"
".\x86-temp-release\pythoncore_pgo\sha256module.obj"
".\x86-temp-release\pythoncore_pgo\sha512module.obj"
".\x86-temp-release\pythoncore_pgo\shamodule.obj"
".\x86-temp-release\pythoncore_pgo\signalmodule.obj"
".\x86-temp-release\pythoncore_pgo\sliceobject.obj"
".\x86-temp-release\pythoncore_pgo\stringobject.obj"
".\x86-temp-release\pythoncore_pgo\stropmodule.obj"
".\x86-temp-release\pythoncore_pgo\structmember.obj"
".\x86-temp-release\pythoncore_pgo\structseq.obj"
".\x86-temp-release\pythoncore_pgo\symtable.obj"
".\x86-temp-release\pythoncore_pgo\symtablemodule.obj"
".\x86-temp-release\pythoncore_pgo\sysmodule.obj"
".\x86-temp-release\pythoncore_pgo\thread.obj"
".\x86-temp-release\pythoncore_pgo\threadmodule.obj"
".\x86-temp-release\pythoncore_pgo\timemodule.obj"
".\x86-temp-release\pythoncore_pgo\tokenizer.obj"
".\x86-temp-release\pythoncore_pgo\traceback.obj"
".\x86-temp-release\pythoncore_pgo\tupleobject.obj"
".\x86-temp-release\pythoncore_pgo\typeobject.obj"
".\x86-temp-release\pythoncore_pgo\unicodectype.obj"
".\x86-temp-release\pythoncore_pgo\unicodeobject.obj"
".\x86-temp-release\pythoncore_pgo\weakrefobject.obj"
".\x86-temp-release\pythoncore_pgo\xxsubtype.obj"
".\x86-temp-release\pythoncore_pgo\yuvconvert.obj"
".\x86-temp-release\pythoncore_pgo\zipimport.obj"
PCbuild8/pythonw.vcproj
View file @ b15a0ccf
......@@ -4,19 +4,23 @@
Version="8,00"
Name="pythonw"
ProjectGUID="{F4229CC3-873C-49AE-9729-DD308ED4CD4A}"
RootNamespace="pythonw"
>
<Platforms>
<Platform
Name="Win32"
/>
<Platform
Name="x64"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\."
IntermediateDirectory=".\x86-temp-debug\pythonw"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\pythonw"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
......@@ -62,11 +66,12 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="./pythonw_d.exe"
OutputFile="$(OutDir)\pythonw_d.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\./pythonw_d.pdb"
ProgramDatabaseFile=""
SubSystem="2"
StackReserveSize="2000000"
BaseAddress="0x1d000000"
......@@ -98,9 +103,9 @@
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\."
IntermediateDirectory=".\x86-temp-release\pythonw"
Name="Debug|x64"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\pythonw"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
......@@ -120,16 +125,14 @@
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
Optimization="0"
AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
SuppressStartupBanner="true"
......@@ -141,7 +144,7 @@
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
/>
<Tool
......@@ -149,15 +152,16 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile=".\./pythonw.exe"
OutputFile="$(OutDir)\pythonw_d.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\./pythonw.pdb"
ProgramDatabaseFile=""
SubSystem="2"
StackReserveSize="2000000"
BaseAddress="0x1d000000"
TargetMachine="1"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
......@@ -185,9 +189,9 @@
/>
</Configuration>
<Configuration
Name="ReleaseItanium|Win32"
OutputDirectory=".\."
IntermediateDirectory=".\ia64-temp-release\pythonw"
Name="Release|Win32"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\pythonw"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
......@@ -210,20 +214,16 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_ITANIUM"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="true"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CompileAs="0"
/>
......@@ -240,16 +240,16 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
OutputFile=".\./pythonw.exe"
OutputFile="$(OutDir)\pythonw.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\./pythonw.pdb"
ProgramDatabaseFile=""
SubSystem="2"
StackReserveSize="2000000"
BaseAddress="0x1d000000"
TargetMachine="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
......@@ -277,9 +277,9 @@
/>
</Configuration>
<Configuration
Name="ReleaseAMD64|Win32"
OutputDirectory="."
IntermediateDirectory="amd64-temp-release\pythonw"
Name="Release|x64"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\pythonw"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
......@@ -299,23 +299,20 @@
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_OPTERON"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="true"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CompileAs="0"
/>
......@@ -332,16 +329,16 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
OutputFile=".\./pythonw.exe"
OutputFile="$(OutDir)\pythonw.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\./pythonw.pdb"
ProgramDatabaseFile=""
SubSystem="2"
StackReserveSize="2000000"
BaseAddress="0x1d000000"
TargetMachine="0"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
......
PCbuild8/readme.txt
View file @ b15a0ccf
......@@ -12,7 +12,7 @@ the "Standard" toolbar"), and build the projects.
The proper order to build subprojects:
1) pythoncore (this builds the main Python DLL and library files,
python25.{dll, lib} in Release mode)
python26.{dll, lib} in Release mode)
NOTE: in previous releases, this subproject was
named after the release number, e.g. python20.
......@@ -25,8 +25,21 @@ The proper order to build subprojects:
to the subsystems they implement, or are running a Python core buildbot
test slave; see SUBPROJECTS below)
Binary files go into PCBuild8\Win32 or \x64 directories and don't
interfere with each other.
When using the Debug setting, the output files have a _d added to
their name: python25_d.dll, python_d.exe, parser_d.pyd, and so on.
their name: python26_d.dll, python_d.exe, parser_d.pyd, and so on.
There are two special configurations for the pythoncore project and
the solution. These are PGIRelease and PGORelease. They are for
createing profile-guided optimized versions of python.dll.
The former creates the instrumented binaries, and the latter
runs python.exe with the instrumented python.dll on the performance
testsuite, and creates a new, optimized, python.dll in
PCBuild8\Win32\PGORelease, or in the x64 folder. Note that although
we can cross-compile x64 binaries on a 32 bit machine, we cannot
create the PGO binaries, since they require actually running the code.
SUBPROJECTS
-----------
......@@ -37,12 +50,6 @@ supporting that module unless they import the module.
pythoncore
.dll and .lib
pythoncore_pgo
.dll and .lib, a variant of pythoncore that is optimized through a
Profile Guided Optimization (PGO), employing pybench as the profile
case to optimize for. The results are produced as a python25.{dll,lib}
in the subfolder 'pythoncore_pgo'. To use this instead of the
standard Python dll place this dll with the python.exe.
python
.exe
pythonw
......
PCbuild8/select.vcproj
View file @ b15a0ccf
......@@ -4,19 +4,23 @@
Version="8,00"
Name="select"
ProjectGUID="{97239A56-DBC0-41D2-BC14-C87D9B97D63B}"
RootNamespace="select"
>
<Platforms>
<Platform
Name="Win32"
/>
<Platform
Name="x64"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Release|Win32"
OutputDirectory=".\."
IntermediateDirectory=".\x86-temp-release\select"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\select"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
......@@ -64,15 +68,16 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib"
OutputFile="./select.pyd"
OutputFile="$(OutDir)\select.pyd"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\./select.pdb"
ProgramDatabaseFile=""
SubSystem="2"
BaseAddress="0x1D110000"
ImportLibrary=".\./select.lib"
ImportLibrary=""
TargetMachine="1"
/>
<Tool
......@@ -101,9 +106,9 @@
/>
</Configuration>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\."
IntermediateDirectory=".\x86-temp-debug\select"
Name="Release|x64"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\select"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
......@@ -123,13 +128,17 @@
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
RuntimeLibrary="3"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
SuppressStartupBanner="true"
......@@ -148,16 +157,17 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib"
OutputFile="./select_d.pyd"
OutputFile="$(OutDir)\select.pyd"
LinkIncremental="1"
SuppressStartupBanner="true"
IgnoreDefaultLibraryNames="libc,msvcrt"
AdditionalLibraryDirectories="$(OutDir)"
IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\./select_d.pdb"
ProgramDatabaseFile=""
SubSystem="2"
BaseAddress="0x1D110000"
ImportLibrary=".\./select_d.lib"
TargetMachine="1"
ImportLibrary=""
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
......@@ -185,9 +195,9 @@
/>
</Configuration>
<Configuration
Name="ReleaseItanium|Win32"
OutputDirectory=".\."
IntermediateDirectory=".\ia64-temp-release\select"
Name="Debug|Win32"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\select"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
......@@ -210,20 +220,13 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_ITANIUM"
Optimization="2"
InlineFunctionExpansion="1"
Optimization="0"
AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
StringPooling="true"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CompileAs="0"
/>
......@@ -238,18 +241,18 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
AdditionalDependencies="wsock32.lib"
OutputFile="./select.pyd"
OutputFile="$(OutDir)\select_d.pyd"
LinkIncremental="1"
SuppressStartupBanner="true"
IgnoreDefaultLibraryNames="libc"
AdditionalLibraryDirectories="$(OutDir)"
IgnoreDefaultLibraryNames="libc,msvcrt"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\./select.pdb"
ProgramDatabaseFile=""
SubSystem="2"
BaseAddress="0x1D110000"
ImportLibrary=".\./select.lib"
TargetMachine="0"
ImportLibrary=""
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
......@@ -277,9 +280,9 @@
/>
</Configuration>
<Configuration
Name="ReleaseAMD64|Win32"
OutputDirectory="."
IntermediateDirectory="amd64-temp-release\select"
Name="Debug|x64"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\select"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
......@@ -299,23 +302,17 @@
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_OPTERON"
Optimization="2"
InlineFunctionExpansion="1"
Optimization="0"
AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
StringPooling="true"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CompileAs="0"
/>
......@@ -330,18 +327,18 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
AdditionalDependencies="wsock32.lib"
OutputFile="./select.pyd"
OutputFile="$(OutDir)\select_d.pyd"
LinkIncremental="1"
SuppressStartupBanner="true"
IgnoreDefaultLibraryNames="libc"
AdditionalLibraryDirectories="$(OutDir)"
IgnoreDefaultLibraryNames="libc,msvcrt"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\./select.pdb"
ProgramDatabaseFile=""
SubSystem="2"
BaseAddress="0x1D110000"
ImportLibrary=".\./select.lib"
TargetMachine="0"
ImportLibrary=""
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
......
PCbuild8/unicodedata.vcproj
View file @ b15a0ccf
......@@ -4,19 +4,23 @@
Version="8,00"
Name="unicodedata"
ProjectGUID="{FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}"
RootNamespace="unicodedata"
>
<Platforms>
<Platform
Name="Win32"
/>
<Platform
Name="x64"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Release|Win32"
OutputDirectory=".\."
IntermediateDirectory=".\x86-temp-release\unicodedata"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\unicodedata"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
......@@ -63,12 +67,14 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="./unicodedata.pyd"
OutputFile="$(OutDir)\unicodedata.pyd"
LinkIncremental="1"
SuppressStartupBanner="true"
ProgramDatabaseFile=".\./unicodedata.pdb"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile=""
BaseAddress="0x1D120000"
ImportLibrary=".\./unicodedata.lib"
ImportLibrary=""
TargetMachine="1"
/>
<Tool
......@@ -97,9 +103,9 @@
/>
</Configuration>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\."
IntermediateDirectory=".\x86-temp-debug\unicodedata"
Name="Release|x64"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\unicodedata"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
......@@ -120,18 +126,20 @@
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
......@@ -145,14 +153,15 @@
/>
<Tool
Name="VCLinkerTool"
OutputFile="./unicodedata_d.pyd"
OutputFile="$(OutDir)\unicodedata.pyd"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\./unicodedata_d.pdb"
ProgramDatabaseFile=""
BaseAddress="0x1D120000"
ImportLibrary=".\./unicodedata_d.lib"
TargetMachine="1"
ImportLibrary=""
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
......@@ -180,9 +189,9 @@
/>
</Configuration>
<Configuration
Name="ReleaseItanium|Win32"
OutputDirectory=".\."
IntermediateDirectory=".\ia64-temp-release\unicodedata"
Name="Debug|Win32"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\unicodedata"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
......@@ -206,20 +215,14 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_ITANIUM"
Optimization="2"
InlineFunctionExpansion="1"
Optimization="0"
AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS"
StringPooling="true"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CompileAs="0"
/>
......@@ -234,14 +237,15 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
OutputFile="./unicodedata.pyd"
OutputFile="$(OutDir)\unicodedata_d.pyd"
LinkIncremental="1"
SuppressStartupBanner="true"
ProgramDatabaseFile=".\./unicodedata.pdb"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile=""
BaseAddress="0x1D120000"
ImportLibrary=".\./unicodedata.lib"
TargetMachine="0"
ImportLibrary=""
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
......@@ -269,9 +273,9 @@
/>
</Configuration>
<Configuration
Name="ReleaseAMD64|Win32"
OutputDirectory="."
IntermediateDirectory="amd64-temp-release\unicodedata"
Name="Debug|x64"
OutputDirectory="$(PlatformName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)\unicodedata"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
......@@ -292,23 +296,18 @@
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions=" /USECL:MS_OPTERON /GS-"
Optimization="2"
InlineFunctionExpansion="1"
Optimization="0"
AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS"
StringPooling="true"
BasicRuntimeChecks="0"
RuntimeLibrary="2"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="true"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MMAP_EXPORTS"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CompileAs="0"
/>
......@@ -323,14 +322,15 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
OutputFile="./unicodedata.pyd"
OutputFile="$(OutDir)\unicodedata_d.pyd"
LinkIncremental="1"
SuppressStartupBanner="true"
ProgramDatabaseFile=".\./unicodedata.pdb"
AdditionalLibraryDirectories="$(OutDir)"
GenerateDebugInformation="true"
ProgramDatabaseFile=""
BaseAddress="0x1D120000"
ImportLibrary=".\./unicodedata.lib"
TargetMachine="0"
ImportLibrary=""
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
......
PCbuild8/w9xpopen.vcproj
View file @ b15a0ccf
This diff is collapsed.
PCbuild8/winsound.vcproj
View file @ b15a0ccf
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7