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

Todo:  Set .dll optimized load addresses, and side-by-side packaging of the python26.dll.

diff --git a/PCbuild8/make_versioninfo/make_versioninfo.vcproj b/PCbuild8/make_versioninfo/make_versioninfo.vcproj
index 95daa07addb61de93d4b8fe1853e7d7da0f02712..6e51944065bf598eaae5f86b4ff2488c2e84c6f8 100644 (file)
--- a/PCbuild8/make_versioninfo/make_versioninfo.vcproj
+++ b/PCbuild8/make_versioninfo/make_versioninfo.vcproj
@@ -90,7 +90,7 @@
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
                                Description="Generating python_rc.h"\r
-                               CommandLine="$(OutDir)\$(TargetFileName) &gt; ..\..\PC\python_rc.h&#x0D;&#x0A;$(OutDir)\$(TargetFileName) &gt; ..\..\PC\python_rc_d.h&#x0D;&#x0A;"\r
+                               CommandLine="$(OutDir)\$(TargetFileName) &gt; ..\..\PC\pythonnt_rc.h&#x0D;&#x0A;$(OutDir)\$(TargetFileName) &gt; ..\..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"\r
                        />\r
                </Configuration>\r
        </Configurations>\r

diff --git a/PCbuild8/pcbuild.sln b/PCbuild8/pcbuild.sln
index 2690e08c571af2a71ab86ca00322c64f942ea8c0..982a16dd35b119a0048654fac9a86cba85b34f82 100644 (file)
--- a/PCbuild8/pcbuild.sln
+++ b/PCbuild8/pcbuild.sln
@@ -2,8 +2,8 @@ Microsoft Visual Studio Solution File, Format Version 9.00
 # 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 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes\_ctypes.
        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

diff --git a/PCbuild8/pyproject.vsprops b/PCbuild8/pyproject.vsprops
index ace5fbfbcc3ab4bce02ad4b6979af7e7122c696b..e4c5f736bc0a4a26999fda1dc6f3d7258611fa21 100644 (file)
--- a/PCbuild8/pyproject.vsprops
+++ b/PCbuild8/pyproject.vsprops
@@ -15,6 +15,10 @@
                Name="VCLinkerTool"\r
                AdditionalLibraryDirectories="$(OutDir)"\r
        />\r
+       <Tool\r
+               Name="VCResourceCompilerTool"\r
+               AdditionalIncludeDirectories="..\..\PC;..\..\Include"\r
+       />\r
        <UserMacro\r
                Name="PyDllName"\r
                Value="python26"\r

diff --git a/PCbuild8/python/python.vcproj b/PCbuild8/python/python.vcproj
index 5bf89123d607b14b69e0b562d967a6a03f7c7c6b..2ec1b8aef8a581bd68a83c1296c906c611d19c9b 100644 (file)
--- a/PCbuild8/python/python.vcproj
+++ b/PCbuild8/python/python.vcproj
@@ -65,6 +65,8 @@
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
+                               StackReserveSize="2000000"\r
+                               LargeAddressAware="2"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
@@ -140,6 +142,7 @@
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
+                               StackReserveSize="3000000"\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
@@ -212,6 +215,8 @@
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
+                               StackReserveSize="2000000"\r
+                               LargeAddressAware="2"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="1"\r
@@ -287,6 +292,7 @@
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
+                               StackReserveSize="3000000"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="17"\r
@@ -361,6 +367,8 @@
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
+                               StackReserveSize="2000000"\r
+                               LargeAddressAware="2"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="1"\r
@@ -436,6 +444,7 @@
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
+                               StackReserveSize="3000000"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="17"\r
@@ -510,6 +519,8 @@
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
+                               StackReserveSize="2000000"\r
+                               LargeAddressAware="2"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="1"\r
@@ -585,6 +596,7 @@
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
+                               StackReserveSize="3000000"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="17"\r

diff --git a/PCbuild8/pythoncore/pythoncore.vcproj b/PCbuild8/pythoncore/pythoncore.vcproj
index 844daf4659d9724f6a7b7313952628d0b76f7ca4..150277a0d8a62229b3a02838e650470ee4e3056a 100644 (file)
--- a/PCbuild8/pythoncore/pythoncore.vcproj
+++ b/PCbuild8/pythoncore/pythoncore.vcproj
@@ -941,6 +941,10 @@
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
+                       <File\r
+                               RelativePath="..\..\PC\python_nt.rc"\r
+                               >\r
+                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="Include"\r

diff --git a/PCbuild8/pythonw/pythonw.vcproj b/PCbuild8/pythonw/pythonw.vcproj
index fbf06a818846e5f9e280ccd9a78e91726e98f33a..9e2dc7bfce0cb5e71527328381537d5acdef3a45 100644 (file)
--- a/PCbuild8/pythonw/pythonw.vcproj
+++ b/PCbuild8/pythonw/pythonw.vcproj
@@ -65,6 +65,8 @@
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
+                               StackReserveSize="2000000"\r
+                               LargeAddressAware="2"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
@@ -140,6 +142,7 @@
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
+                               StackReserveSize="3000000"\r
                                TargetMachine="17"\r
                        />\r
                        <Tool\r
@@ -211,6 +214,8 @@
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
+                               StackReserveSize="2000000"\r
+                               LargeAddressAware="2"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="1"\r
@@ -285,6 +290,7 @@
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
+                               StackReserveSize="3000000"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="17"\r
@@ -358,6 +364,8 @@
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
+                               StackReserveSize="2000000"\r
+                               LargeAddressAware="2"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="1"\r
@@ -432,6 +440,7 @@
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
+                               StackReserveSize="3000000"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="17"\r
@@ -505,6 +514,8 @@
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
+                               StackReserveSize="2000000"\r
+                               LargeAddressAware="2"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="1"\r
@@ -579,6 +590,7 @@
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
+                               StackReserveSize="3000000"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="17"\r