Skip to content

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

Fix pcbuild8 after recent overhaul: Added the version resource to... 

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.
parent 27f4abf3
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 5 deletions
PCbuild8/make_versioninfo/make_versioninfo.vcproj
View file @ 19ac472b
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
Description="Generating python_rc.h" Description="Generating python_rc.h"
CommandLine="$(OutDir)\$(TargetFileName) &gt; ..\..\PC\python_rc.h&#x0D;&#x0A;$(OutDir)\$(TargetFileName) &gt; ..\..\PC\python_rc_d.h&#x0D;&#x0A;" CommandLine="$(OutDir)\$(TargetFileName) &gt; ..\..\PC\pythonnt_rc.h&#x0D;&#x0A;$(OutDir)\$(TargetFileName) &gt; ..\..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"
/> />
</Configuration> </Configuration>
</Configurations> </Configurations>
......
PCbuild8/pcbuild.sln
View file @ 19ac472b
...@@ -2,8 +2,8 @@ Microsoft Visual Studio Solution File, Format Version 9.00 ...@@ -2,8 +2,8 @@ Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005 # Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", "pythoncore\pythoncore.vcproj", "{987306EC-6BAD-4440-B4FB-A699A1EE6A28}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", "pythoncore\pythoncore.vcproj", "{987306EC-6BAD-4440-B4FB-A699A1EE6A28}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{87AB87DB-B665-4621-A67B-878C15B93FF0} = {87AB87DB-B665-4621-A67B-878C15B93FF0}
{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED} = {2AB2AC43-1B73-40B1-8964-95B3FC3F15ED} {2AB2AC43-1B73-40B1-8964-95B3FC3F15ED} = {2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}
{87AB87DB-B665-4621-A67B-878C15B93FF0} = {87AB87DB-B665-4621-A67B-878C15B93FF0}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_versioninfo", "make_versioninfo\make_versioninfo.vcproj", "{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_versioninfo", "make_versioninfo\make_versioninfo.vcproj", "{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}"
...@@ -16,9 +16,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes\_ctypes. ...@@ -16,9 +16,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes\_ctypes.
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes_test", "_ctypes_test\_ctypes_test.vcproj", "{F548A318-960A-4B37-9CD6-86B1B0E33CC8}" 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 EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_elementtree", "_elementtree\_elementtree.vcproj", "{CB025148-F0A1-4B32-A669-19EE0534136D}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_elementtree", "_elementtree\_elementtree.vcproj", "{CB025148-F0A1-4B32-A669-19EE0534136D}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
......
PCbuild8/pyproject.vsprops
View file @ 19ac472b
...@@ -15,6 +15,10 @@ ...@@ -15,6 +15,10 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalLibraryDirectories="$(OutDir)" AdditionalLibraryDirectories="$(OutDir)"
/> />
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\PC;..\..\Include"
/>
<UserMacro <UserMacro
Name="PyDllName" Name="PyDllName"
Value="python26" Value="python26"
......
PCbuild8/python/python.vcproj
View file @ 19ac472b
...@@ -65,6 +65,8 @@ ...@@ -65,6 +65,8 @@
LinkIncremental="2" LinkIncremental="2"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
StackReserveSize="2000000"
LargeAddressAware="2"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
...@@ -140,6 +142,7 @@ ...@@ -140,6 +142,7 @@
LinkIncremental="2" LinkIncremental="2"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
StackReserveSize="3000000"
TargetMachine="17" TargetMachine="17"
/> />
<Tool <Tool
...@@ -212,6 +215,8 @@ ...@@ -212,6 +215,8 @@
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
StackReserveSize="2000000"
LargeAddressAware="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
TargetMachine="1" TargetMachine="1"
...@@ -287,6 +292,7 @@ ...@@ -287,6 +292,7 @@
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
StackReserveSize="3000000"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
TargetMachine="17" TargetMachine="17"
...@@ -361,6 +367,8 @@ ...@@ -361,6 +367,8 @@
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
StackReserveSize="2000000"
LargeAddressAware="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
TargetMachine="1" TargetMachine="1"
...@@ -436,6 +444,7 @@ ...@@ -436,6 +444,7 @@
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
StackReserveSize="3000000"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
TargetMachine="17" TargetMachine="17"
...@@ -510,6 +519,8 @@ ...@@ -510,6 +519,8 @@
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
StackReserveSize="2000000"
LargeAddressAware="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
TargetMachine="1" TargetMachine="1"
...@@ -585,6 +596,7 @@ ...@@ -585,6 +596,7 @@
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
StackReserveSize="3000000"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
TargetMachine="17" TargetMachine="17"
......
PCbuild8/pythoncore/pythoncore.vcproj
View file @ 19ac472b
...@@ -941,6 +941,10 @@ ...@@ -941,6 +941,10 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" 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}" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
> >
<File
RelativePath="..\..\PC\python_nt.rc"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="Include" Name="Include"
......
PCbuild8/pythonw/pythonw.vcproj
View file @ 19ac472b
...@@ -65,6 +65,8 @@ ...@@ -65,6 +65,8 @@
LinkIncremental="2" LinkIncremental="2"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
StackReserveSize="2000000"
LargeAddressAware="2"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
...@@ -140,6 +142,7 @@ ...@@ -140,6 +142,7 @@
LinkIncremental="2" LinkIncremental="2"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
StackReserveSize="3000000"
TargetMachine="17" TargetMachine="17"
/> />
<Tool <Tool
...@@ -211,6 +214,8 @@ ...@@ -211,6 +214,8 @@
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
StackReserveSize="2000000"
LargeAddressAware="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
TargetMachine="1" TargetMachine="1"
...@@ -285,6 +290,7 @@ ...@@ -285,6 +290,7 @@
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
StackReserveSize="3000000"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
TargetMachine="17" TargetMachine="17"
...@@ -358,6 +364,8 @@ ...@@ -358,6 +364,8 @@
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
StackReserveSize="2000000"
LargeAddressAware="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
TargetMachine="1" TargetMachine="1"
...@@ -432,6 +440,7 @@ ...@@ -432,6 +440,7 @@
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
StackReserveSize="3000000"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
TargetMachine="17" TargetMachine="17"
...@@ -505,6 +514,8 @@ ...@@ -505,6 +514,8 @@
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
StackReserveSize="2000000"
LargeAddressAware="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
TargetMachine="1" TargetMachine="1"
...@@ -579,6 +590,7 @@ ...@@ -579,6 +590,7 @@
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
StackReserveSize="3000000"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
TargetMachine="17" TargetMachine="17"
......
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