[Python-checkins] r55101 - in python/trunk/PCbuild8: make_versioninfo/make_versioninfo.vcproj pcbuild.sln pyproject.vsprops python/python.vcproj pythoncore/pythoncore.vcproj pythonw/pythonw.vcproj
kristjan.jonsson
python-checkins at python.org
Thu May 3 22:04:57 CEST 2007
Author: kristjan.jonsson
Date: Thu May 3 22:04:53 2007
New Revision: 55101
Modified:
python/trunk/PCbuild8/make_versioninfo/make_versioninfo.vcproj
python/trunk/PCbuild8/pcbuild.sln
python/trunk/PCbuild8/pyproject.vsprops
python/trunk/PCbuild8/python/python.vcproj
python/trunk/PCbuild8/pythoncore/pythoncore.vcproj
python/trunk/PCbuild8/pythonw/pythonw.vcproj
Log:
Fix pcbuild8 after recent overhaul: Added the version resource to python26.dll. Adjust stacksize to 2Mb and made large address aware for 32 bits, and set stacksize to 3Mb for 64 bits.
Todo: Set .dll optimized load addresses, and side-by-side packaging of the python26.dll.
Modified: python/trunk/PCbuild8/make_versioninfo/make_versioninfo.vcproj
==============================================================================
--- python/trunk/PCbuild8/make_versioninfo/make_versioninfo.vcproj (original)
+++ python/trunk/PCbuild8/make_versioninfo/make_versioninfo.vcproj Thu May 3 22:04:53 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/trunk/PCbuild8/pcbuild.sln
==============================================================================
--- python/trunk/PCbuild8/pcbuild.sln (original)
+++ python/trunk/PCbuild8/pcbuild.sln Thu May 3 22:04:53 2007
@@ -2,8 +2,8 @@
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", "pythoncore\pythoncore.vcproj", "{987306EC-6BAD-4440-B4FB-A699A1EE6A28}"
ProjectSection(ProjectDependencies) = postProject
- {87AB87DB-B665-4621-A67B-878C15B93FF0} = {87AB87DB-B665-4621-A67B-878C15B93FF0}
{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED} = {2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}
+ {87AB87DB-B665-4621-A67B-878C15B93FF0} = {87AB87DB-B665-4621-A67B-878C15B93FF0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_versioninfo", "make_versioninfo\make_versioninfo.vcproj", "{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}"
@@ -16,9 +16,6 @@
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes_test", "_ctypes_test\_ctypes_test.vcproj", "{F548A318-960A-4B37-9CD6-86B1B0E33CC8}"
- ProjectSection(ProjectDependencies) = postProject
- {8D80F68B-F6EC-4E69-9B04-73F632A8A8ED} = {8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}
- EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_elementtree", "_elementtree\_elementtree.vcproj", "{CB025148-F0A1-4B32-A669-19EE0534136D}"
ProjectSection(ProjectDependencies) = postProject
Modified: python/trunk/PCbuild8/pyproject.vsprops
==============================================================================
--- python/trunk/PCbuild8/pyproject.vsprops (original)
+++ python/trunk/PCbuild8/pyproject.vsprops Thu May 3 22:04:53 2007
@@ -15,6 +15,10 @@
Name="VCLinkerTool"
AdditionalLibraryDirectories="$(OutDir)"
/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories="..\..\PC;..\..\Include"
+ />
<UserMacro
Name="PyDllName"
Value="python26"
Modified: python/trunk/PCbuild8/python/python.vcproj
==============================================================================
--- python/trunk/PCbuild8/python/python.vcproj (original)
+++ python/trunk/PCbuild8/python/python.vcproj Thu May 3 22:04:53 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/trunk/PCbuild8/pythoncore/pythoncore.vcproj
==============================================================================
--- python/trunk/PCbuild8/pythoncore/pythoncore.vcproj (original)
+++ python/trunk/PCbuild8/pythoncore/pythoncore.vcproj Thu May 3 22:04:53 2007
@@ -941,6 +941,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/trunk/PCbuild8/pythonw/pythonw.vcproj
==============================================================================
--- python/trunk/PCbuild8/pythonw/pythonw.vcproj (original)
+++ python/trunk/PCbuild8/pythonw/pythonw.vcproj Thu May 3 22:04:53 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