Fixes for #1473 and #1476

Added debug builds to make_versioninfo
Removed some more defines

diff --git a/PCbuild9/make_buildinfo.vcproj b/PCbuild9/make_buildinfo.vcproj
index 4fb5d77669e81048d674a97d30ffcae01ade1f00..f3cd0f3dd7a55b424f5fd736667fa0904da4a61e 100644 (file)
--- a/PCbuild9/make_buildinfo.vcproj
+++ b/PCbuild9/make_buildinfo.vcproj
@@ -112,6 +112,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               PreprocessorDefinitions="NDEBUG;_CONSOLE"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"

diff --git a/PCbuild9/make_versioninfo.vcproj b/PCbuild9/make_versioninfo.vcproj
index 88ecc201c7c51807a4486931e321931bec11c0f6..fb192c03f9f45e5fcd23c30a44c0939a3e0d1ba4 100644 (file)
--- a/PCbuild9/make_versioninfo.vcproj
+++ b/PCbuild9/make_versioninfo.vcproj
@@ -31,8 +31,9 @@
                        />
                        <Tool
                                Name="VCCustomBuildTool"
-                               CommandLine=".\make_versioninfo.exe &gt;..\PC\pythonnt_rc.h&#x0D;&#x0A;"
-                               Outputs="..\PC\pythonnt_rc.h"
+                               Description="Build PC/pythonnt_rc(_d).h"
+                               CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\PC\pythonnt_rc.h"
+                               Outputs="$(SolutionDir)..\PC\pythonnt_rc.h"
                        />
                        <Tool
                                Name="VCXMLDataGeneratorTool"
@@ -67,7 +68,7 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="odbccp32.lib"
-                               OutputFile=".\./make_versioninfo.exe"
+                               OutputFile="$(SolutionDir)make_versioninfo.exe"
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
                                SubSystem="1"
@@ -95,7 +96,7 @@
                        />
                        <Tool
                                Name="VCPostBuildEventTool"
-                               CommandLine="$(TargetFileName) &gt; ..\PC\python_nt.h"
+                               CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\PC\python_nt.h"
                        />
                </Configuration>
                <Configuration
@@ -109,6 +110,9 @@
                        />
                        <Tool
                                Name="VCCustomBuildTool"
+                               Description="Build PC/pythonnt_rc(_d).h"
+                               CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\PC\pythonnt_rc.h"
+                               Outputs="$(SolutionDir)..\PC\pythonnt_rc.h"
                        />
                        <Tool
                                Name="VCXMLDataGeneratorTool"
@@ -121,6 +125,155 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               PreprocessorDefinitions="NDEBUG;_CONSOLE"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               OutputFile="$(SolutionDir)make_versioninfo.exe"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                               CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\PC\python_nt.h"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Debug|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="1"
+                       InheritedPropertySheets=".\pyproject.vsprops"
+                       UseOfMFC="0"
+                       ATLMinimizesCRunTimeLibraryUsage="false"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                               Description="Build PC/pythonnt_rc(_d).h"
+                               CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\PC\pythonnt_rc_d.h"
+                               Outputs="$(SolutionDir)..\PC\pythonnt_rc_d.h"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="2"
+                               InlineFunctionExpansion="1"
+                               AdditionalIncludeDirectories=""
+                               PreprocessorDefinitions="_DEBUG;_CONSOLE"
+                               StringPooling="true"
+                               RuntimeLibrary="2"
+                               EnableFunctionLevelLinking="true"
+                               UsePrecompiledHeader="0"
+                               CompileAs="0"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="odbccp32.lib"
+                               OutputFile="$(SolutionDir)make_versioninfo_d.exe"
+                               GenerateDebugInformation="true"
+                               ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
+                               SubSystem="1"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               BaseAddress="0x1d000000"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                               CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\PC\python_nt_d.h"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Debug|x64"
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+                       ConfigurationType="1"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                               Description="Build PC/pythonnt_rc(_d).h"
+                               CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\PC\pythonnt_rc_d.h"
+                               Outputs="$(SolutionDir)..\PC\pythonnt_rc_d.h"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               TargetEnvironment="3"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               PreprocessorDefinitions="_DEBUG;_CONSOLE"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
@@ -133,6 +286,8 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               OutputFile="$(SolutionDir)make_versioninfo_d.exe"
+                               TargetMachine="17"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -154,6 +309,7 @@
                        />
                        <Tool
                                Name="VCPostBuildEventTool"
+                               CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\PC\python_nt_d.h"
                        />
                </Configuration>
        </Configurations>

diff --git a/PCbuild9/pcbuild.sln b/PCbuild9/pcbuild.sln
index d42a0900a7ee5367589f7750e1f78a334ef0efea..1625875dd4b5edb5d5eab575cf9fbdc38d82eed7 100644 (file)
--- a/PCbuild9/pcbuild.sln
+++ b/PCbuild9/pcbuild.sln
@@ -118,17 +118,18 @@ Global
                Release|x64 = Release|x64
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.ActiveCfg = Release|Win32
-               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.Build.0 = Release|Win32
-               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg = Release|Win32
+               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.ActiveCfg = Debug|Win32
+               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.Build.0 = Debug|Win32
+               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg = Debug|Win32
+               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.Build.0 = Debug|Win32
                {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|Win32.ActiveCfg = Release|Win32
                {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|Win32.Build.0 = Release|Win32
-               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.ActiveCfg = Release|x64
-               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.Build.0 = Release|x64
+               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.ActiveCfg = Release|Win32
+               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.Build.0 = Release|Win32
                {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|Win32.ActiveCfg = Release|Win32
                {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|Win32.Build.0 = Release|Win32
-               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.ActiveCfg = Release|x64
-               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.Build.0 = Release|x64
+               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.ActiveCfg = Release|Win32
+               {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.Build.0 = Release|Win32
                {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.ActiveCfg = Release|Win32
                {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.Build.0 = Release|Win32
                {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.ActiveCfg = Release|Win32
@@ -200,14 +201,15 @@ Global
                {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.ActiveCfg = Release|Win32
                {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.Build.0 = Release|Win32
                {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.ActiveCfg = Release|Win32
+               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.Build.0 = Release|Win32
                {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|Win32.ActiveCfg = Release|Win32
                {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|Win32.Build.0 = Release|Win32
-               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.ActiveCfg = Release|x64
-               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.Build.0 = Release|x64
+               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.ActiveCfg = Release|Win32
+               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.Build.0 = Release|Win32
                {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|Win32.ActiveCfg = Release|Win32
                {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|Win32.Build.0 = Release|Win32
-               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.ActiveCfg = Release|x64
-               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.Build.0 = Release|x64
+               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.ActiveCfg = Release|Win32
+               {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.Build.0 = Release|Win32
                {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.ActiveCfg = Release|Win32
                {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.Build.0 = Release|Win32
                {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.ActiveCfg = Release|Win32

diff --git a/PCbuild9/pyproject.vsprops b/PCbuild9/pyproject.vsprops
index 271f65e85a727a9d281f204470c5d27f62c25c3a..e1c90231ff491cec573c46b9f73f6475d67604f5 100644 (file)
--- a/PCbuild9/pyproject.vsprops
+++ b/PCbuild9/pyproject.vsprops
@@ -11,7 +11,7 @@
                Optimization="2"
                InlineFunctionExpansion="1"
                AdditionalIncludeDirectories="..\Include; ..\PC"
-               PreprocessorDefinitions="WIN32;_WINDOWS;_WIN32;_CRT_SECURE_NO_DEPRECATE"
+               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
                StringPooling="true"
                ExceptionHandling="0"
                RuntimeLibrary="0"

diff --git a/PCbuild9/pythoncore.vcproj b/PCbuild9/pythoncore.vcproj
index 7fd63787eaee1bd4d512c078a054784d0c89bd93..54ca00f81a2a666c6b3641e3fc596266ebc4b795 100644 (file)
--- a/PCbuild9/pythoncore.vcproj
+++ b/PCbuild9/pythoncore.vcproj
@@ -60,7 +60,7 @@
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="generate buildinfo"
-                               CommandLine="$(SolutionDir)make_buildinfo.exe $(ConfigurationName)"
+                               CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_buildinfo.exe $(ConfigurationName)"
                        />
                        <Tool
                                Name="VCLinkerTool"