[Python-checkins] r55144 - in python/branches/release25-maint/PCbuild8: _ctypes/_ctypes.vcproj _ctypes/_ctypes.vsprops _ctypes/masm64.rules make_versioninfo/make_versioninfo.vcproj pyproject.vsprops python/python.vcproj pythoncore/pythoncore.vcproj pythonw/pythonw.vcproj
kristjan.jonsson
python-checkins at python.org
Sat May 5 10:32:04 CEST 2007
Author: kristjan.jonsson
Date: Sat May 5 10:32:03 2007
New Revision: 55144
Added:
python/branches/release25-maint/PCbuild8/_ctypes/_ctypes.vsprops
- copied unchanged from r55143, python/trunk/PCbuild8/_ctypes/_ctypes.vsprops
python/branches/release25-maint/PCbuild8/_ctypes/masm64.rules
- copied unchanged from r55143, python/trunk/PCbuild8/_ctypes/masm64.rules
Modified:
python/branches/release25-maint/PCbuild8/_ctypes/_ctypes.vcproj
python/branches/release25-maint/PCbuild8/make_versioninfo/make_versioninfo.vcproj
python/branches/release25-maint/PCbuild8/pyproject.vsprops
python/branches/release25-maint/PCbuild8/python/python.vcproj
python/branches/release25-maint/PCbuild8/pythoncore/pythoncore.vcproj
python/branches/release25-maint/PCbuild8/pythonw/pythonw.vcproj
Log:
Merging changes 55092, 55101,55120 from trunk, making PCBuild8 solution up to date.
Modified: python/branches/release25-maint/PCbuild8/_ctypes/_ctypes.vcproj
==============================================================================
--- python/branches/release25-maint/PCbuild8/_ctypes/_ctypes.vcproj (original)
+++ python/branches/release25-maint/PCbuild8/_ctypes/_ctypes.vcproj Sat May 5 10:32:03 2007
@@ -16,12 +16,15 @@
/>
</Platforms>
<ToolFiles>
+ <ToolFile
+ RelativePath=".\masm64.rules"
+ />
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
ConfigurationType="2"
- InheritedPropertySheets="..\pyd_d.vsprops"
+ InheritedPropertySheets="..\pyd_d.vsprops;.\_ctypes.vsprops"
CharacterSet="0"
>
<Tool
@@ -31,6 +34,9 @@
Name="VCCustomBuildTool"
/>
<Tool
+ Name="MASM64"
+ />
+ <Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
@@ -42,7 +48,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
+ AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -93,9 +99,8 @@
</Configuration>
<Configuration
Name="Debug|x64"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
- InheritedPropertySheets="..\pyd_d.vsprops"
+ InheritedPropertySheets="..\pyd_d.vsprops;.\_ctypes.vsprops"
CharacterSet="0"
>
<Tool
@@ -105,6 +110,9 @@
Name="VCCustomBuildTool"
/>
<Tool
+ Name="MASM64"
+ />
+ <Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
@@ -117,7 +125,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
+ AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -169,7 +177,7 @@
<Configuration
Name="Release|Win32"
ConfigurationType="2"
- InheritedPropertySheets="..\pyd.vsprops"
+ InheritedPropertySheets="..\pyd.vsprops;.\_ctypes.vsprops"
CharacterSet="0"
WholeProgramOptimization="1"
>
@@ -180,6 +188,9 @@
Name="VCCustomBuildTool"
/>
<Tool
+ Name="MASM64"
+ />
+ <Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
@@ -190,7 +201,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
+ AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -243,7 +254,7 @@
<Configuration
Name="Release|x64"
ConfigurationType="2"
- InheritedPropertySheets="..\pyd.vsprops"
+ InheritedPropertySheets="..\pyd.vsprops;.\_ctypes.vsprops"
CharacterSet="0"
WholeProgramOptimization="1"
>
@@ -254,6 +265,9 @@
Name="VCCustomBuildTool"
/>
<Tool
+ Name="MASM64"
+ />
+ <Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
@@ -265,7 +279,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
+ AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -318,7 +332,7 @@
<Configuration
Name="PGInstrument|Win32"
ConfigurationType="2"
- InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"
+ InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops;.\_ctypes.vsprops"
CharacterSet="0"
WholeProgramOptimization="1"
>
@@ -329,6 +343,9 @@
Name="VCCustomBuildTool"
/>
<Tool
+ Name="MASM64"
+ />
+ <Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
@@ -339,7 +356,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
+ AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -392,7 +409,7 @@
<Configuration
Name="PGInstrument|x64"
ConfigurationType="2"
- InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"
+ InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops;.\_ctypes.vsprops"
CharacterSet="0"
WholeProgramOptimization="1"
>
@@ -403,6 +420,9 @@
Name="VCCustomBuildTool"
/>
<Tool
+ Name="MASM64"
+ />
+ <Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
@@ -414,7 +434,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
+ AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -467,7 +487,7 @@
<Configuration
Name="PGUpdate|Win32"
ConfigurationType="2"
- InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"
+ InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops;.\_ctypes.vsprops"
CharacterSet="0"
WholeProgramOptimization="1"
>
@@ -478,6 +498,9 @@
Name="VCCustomBuildTool"
/>
<Tool
+ Name="MASM64"
+ />
+ <Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
@@ -488,7 +511,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
+ AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -541,7 +564,7 @@
<Configuration
Name="PGUpdate|x64"
ConfigurationType="2"
- InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"
+ InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops;.\_ctypes.vsprops"
CharacterSet="0"
WholeProgramOptimization="1"
>
@@ -552,6 +575,9 @@
Name="VCCustomBuildTool"
/>
<Tool
+ Name="MASM64"
+ />
+ <Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
@@ -563,7 +589,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
+ AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CTYPES_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -721,6 +747,74 @@
<File
RelativePath="..\..\Modules\_ctypes\libffi_msvc\win32.c"
>
+ <FileConfiguration
+ Name="Debug|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="PGInstrument|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="PGUpdate|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\..\Modules\_ctypes\libffi_msvc\win64.asm"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="MASM64"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="MASM64"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="PGInstrument|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="MASM64"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="PGUpdate|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="MASM64"
+ />
+ </FileConfiguration>
</File>
</Filter>
<Filter
Modified: python/branches/release25-maint/PCbuild8/make_versioninfo/make_versioninfo.vcproj
==============================================================================
--- python/branches/release25-maint/PCbuild8/make_versioninfo/make_versioninfo.vcproj (original)
+++ python/branches/release25-maint/PCbuild8/make_versioninfo/make_versioninfo.vcproj Sat May 5 10:32:03 2007
@@ -90,7 +90,7 @@
<Tool
Name="VCPostBuildEventTool"
Description="Generating python_rc.h"
- CommandLine="$(OutDir)\$(TargetFileName) > ..\..\PC\python_rc.h
$(OutDir)\$(TargetFileName) > ..\..\PC\python_rc_d.h
"
+ CommandLine="$(OutDir)\$(TargetFileName) > ..\..\PC\pythonnt_rc.h
$(OutDir)\$(TargetFileName) > ..\..\PC\pythonnt_rc_d.h
"
/>
</Configuration>
</Configurations>
Modified: python/branches/release25-maint/PCbuild8/pyproject.vsprops
==============================================================================
--- python/branches/release25-maint/PCbuild8/pyproject.vsprops (original)
+++ python/branches/release25-maint/PCbuild8/pyproject.vsprops Sat May 5 10:32:03 2007
@@ -15,6 +15,10 @@
Name="VCLinkerTool"
AdditionalLibraryDirectories="$(OutDir)"
/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories="..\..\PC;..\..\Include"
+ />
<UserMacro
Name="PyDllName"
Value="python25"
Modified: python/branches/release25-maint/PCbuild8/python/python.vcproj
==============================================================================
--- python/branches/release25-maint/PCbuild8/python/python.vcproj (original)
+++ python/branches/release25-maint/PCbuild8/python/python.vcproj Sat May 5 10:32:03 2007
@@ -65,6 +65,8 @@
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
+ StackReserveSize="2000000"
+ LargeAddressAware="2"
TargetMachine="1"
/>
<Tool
@@ -140,6 +142,7 @@
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
+ StackReserveSize="3000000"
TargetMachine="17"
/>
<Tool
@@ -212,6 +215,8 @@
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
+ StackReserveSize="2000000"
+ LargeAddressAware="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
@@ -287,6 +292,7 @@
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
+ StackReserveSize="3000000"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="17"
@@ -361,6 +367,8 @@
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
+ StackReserveSize="2000000"
+ LargeAddressAware="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
@@ -436,6 +444,7 @@
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
+ StackReserveSize="3000000"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="17"
@@ -510,6 +519,8 @@
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
+ StackReserveSize="2000000"
+ LargeAddressAware="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
@@ -585,6 +596,7 @@
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
+ StackReserveSize="3000000"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="17"
Modified: python/branches/release25-maint/PCbuild8/pythoncore/pythoncore.vcproj
==============================================================================
--- python/branches/release25-maint/PCbuild8/pythoncore/pythoncore.vcproj (original)
+++ python/branches/release25-maint/PCbuild8/pythoncore/pythoncore.vcproj Sat May 5 10:32:03 2007
@@ -937,6 +937,10 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
+ <File
+ RelativePath="..\..\PC\python_nt.rc"
+ >
+ </File>
</Filter>
<Filter
Name="Include"
Modified: python/branches/release25-maint/PCbuild8/pythonw/pythonw.vcproj
==============================================================================
--- python/branches/release25-maint/PCbuild8/pythonw/pythonw.vcproj (original)
+++ python/branches/release25-maint/PCbuild8/pythonw/pythonw.vcproj Sat May 5 10:32:03 2007
@@ -65,6 +65,8 @@
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
+ StackReserveSize="2000000"
+ LargeAddressAware="2"
TargetMachine="1"
/>
<Tool
@@ -140,6 +142,7 @@
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
+ StackReserveSize="3000000"
TargetMachine="17"
/>
<Tool
@@ -211,6 +214,8 @@
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
+ StackReserveSize="2000000"
+ LargeAddressAware="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
@@ -285,6 +290,7 @@
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
+ StackReserveSize="3000000"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="17"
@@ -358,6 +364,8 @@
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
+ StackReserveSize="2000000"
+ LargeAddressAware="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
@@ -432,6 +440,7 @@
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
+ StackReserveSize="3000000"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="17"
@@ -505,6 +514,8 @@
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
+ StackReserveSize="2000000"
+ LargeAddressAware="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
@@ -579,6 +590,7 @@
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="2"
+ StackReserveSize="3000000"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="17"
More information about the Python-checkins
mailing list