Don't run kill_python as part of the build process. Change the buildbots so they...

diff --git a/PCbuild/kill_python.vcproj b/PCbuild/kill_python.vcproj
index 9f11075a0aa8b832642fc1a0d56506e1f71549b9..a34107aab7a24816e6b069fcbf085a0c80755007 100644 (file)
--- a/PCbuild/kill_python.vcproj
+++ b/PCbuild/kill_python.vcproj
@@ -77,8 +77,6 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
-                               Description="Killing existing Python processes..."\r
-                               CommandLine="&quot;$(KillPythonExe)&quot;"\r
                        />\r
                </Configuration>\r
                <Configuration\r
@@ -140,8 +138,6 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
-                               Description="Killing existing Python processes..."\r
-                               CommandLine="&quot;$(KillPythonExe)&quot;"\r
                        />\r
                </Configuration>\r
                <Configuration\r
@@ -202,8 +198,6 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
-                               Description="Killing existing Python processes..."\r
-                               CommandLine="&quot;$(KillPythonExe)&quot;"\r
                        />\r
                </Configuration>\r
                <Configuration\r
@@ -265,8 +259,6 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
-                               Description="Killing existing Python processes..."\r
-                               CommandLine="&quot;$(KillPythonExe)&quot;"\r
                        />\r
                </Configuration>\r
        </Configurations>\r

diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index 5e14ef7066c5b44b00eedfd97c45fa507cef7450..9683bd1b0a0a12a11aa8ea313cf9ddd7bc5bae02 100644 (file)
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -58,8 +58,8 @@
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               Description="Generate build information and kill existing Python processes..."
-                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release&#x0D;&#x0A;&quot;$(KillPythonExe)&quot;"
+                               Description="Generate build information..."
+                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"
                        />
                        <Tool
                                Name="VCLinkerTool"
@@ -133,8 +133,8 @@
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               Description="Generate build information and kill existing Python processes..."
-                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release&#x0D;&#x0A;&quot;$(KillPythonExe)&quot;"
+                               Description="Generate build information..."
+                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"
                        />
                        <Tool
                                Name="VCLinkerTool"
@@ -211,8 +211,8 @@
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               Description="Generate build information and kill existing Python processes..."
-                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Debug&#x0D;&#x0A;&quot;$(KillPythonExe)&quot;"
+                               Description="Generate build information..."
+                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Debug"
                        />
                        <Tool
                                Name="VCLinkerTool"
@@ -289,8 +289,8 @@
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               Description="Generate build information and kill existing Python processes..."
-                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Debug&#x0D;&#x0A;&quot;$(KillPythonExe)&quot;"
+                               Description="Generate build information..."
+                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Debug"
                        />
                        <Tool
                                Name="VCLinkerTool"
@@ -363,8 +363,8 @@
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               Description="Generate build information and kill existing Python processes..."
-                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release&#x0D;&#x0A;&quot;$(KillPythonExe)&quot;"
+                               Description="Generate build information..."
+                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"
                        />
                        <Tool
                                Name="VCLinkerTool"
@@ -438,8 +438,8 @@
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               Description="Generate build information and kill existing Python processes..."
-                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release&#x0D;&#x0A;&quot;$(KillPythonExe)&quot;"
+                               Description="Generate build information..."
+                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"
                        />
                        <Tool
                                Name="VCLinkerTool"
@@ -513,8 +513,8 @@
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               Description="Generate build information and kill existing Python processes..."
-                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release&#x0D;&#x0A;&quot;$(KillPythonExe)&quot;"
+                               Description="Generate build information..."
+                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"
                        />
                        <Tool
                                Name="VCLinkerTool"
@@ -588,8 +588,8 @@
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               Description="Generate build information and kill existing Python processes..."
-                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release&#x0D;&#x0A;&quot;$(KillPythonExe)&quot;"
+                               Description="Generate build information..."
+                               CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"
                        />
                        <Tool
                                Name="VCLinkerTool"

diff --git a/Tools/buildbot/build-amd64.bat b/Tools/buildbot/build-amd64.bat
index 1d828ebc4f39fcec445cc079d1552f72b589d1c2..5175c6231e7f7d88985b9dc96b2ddc03a1528a24 100644 (file)
--- a/Tools/buildbot/build-amd64.bat
+++ b/Tools/buildbot/build-amd64.bat
@@ -2,4 +2,5 @@
 cmd /c Tools\buildbot\external-amd64.bat
 call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
 cmd /c Tools\buildbot\clean-amd64.bat
+vcbuild /useenv PCbuild\kill_python.vcproj "Debug|x64" && PCbuild\amd64\kill_python_d.exe
 vcbuild PCbuild\pcbuild.sln "Debug|x64"

diff --git a/Tools/buildbot/build.bat b/Tools/buildbot/build.bat
index 6bac3edbeb9768952d1c3f78d59ea3af5576eaa0..ab3ea7da46a773ecb5273c828316b2a64f58626a 100644 (file)
--- a/Tools/buildbot/build.bat
+++ b/Tools/buildbot/build.bat
@@ -2,5 +2,6 @@
 cmd /c Tools\buildbot\external.bat
 call "%VS90COMNTOOLS%vsvars32.bat"
 cmd /c Tools\buildbot\clean.bat
+vcbuild /useenv PCbuild\kill_python.vcproj "Debug|Win32" && PCbuild\kill_python_d.exe
 vcbuild /useenv PCbuild\pcbuild.sln "Debug|Win32"