From bb65b5bf1dcc17519e4173ecb64a86228cc5cb58 Mon Sep 17 00:00:00 2001
From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 26 Nov 2013 16:32:59 -0600
Subject: Issue #19788: kill_python(_d).exe is now run as a PreBuildEvent on
 the pythoncore sub-project.  This should prevent build errors due a previous
 build's python(_d).exe still running.

---
 Misc/NEWS                      |  4 ++++
 PCbuild/pythoncore.vcxproj     | 48 ++++++++++++++++++++++++++++++++++++++++++
 Tools/buildbot/build-amd64.bat |  3 +--
 Tools/buildbot/build.bat       |  3 +--
 4 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
index 3a331e8..59db14f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -92,6 +92,10 @@ Documentation
 Build
 -----
 
+- Issue #19788: kill_python(_d).exe is now run as a PreBuildEvent on the
+  pythoncore sub-project.  This should prevent build errors due a previous
+  build's python(_d).exe still running.
+
 - Add workaround for VS 2010 nmake clean issue. VS 2010 doesn't set up PATH
   for nmake.exe correctly.
 
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
index 29493e3..89a63d1 100644
--- a/PCbuild/pythoncore.vcxproj
+++ b/PCbuild/pythoncore.vcxproj
@@ -181,6 +181,12 @@
       <IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <BaseAddress>0x1e000000</BaseAddress>
     </Link>
+    <PreBuildEvent>
+      <Command>$(KillPythonExe)</Command>
+    </PreBuildEvent>
+    <PreBuildEvent>
+      <Message>Killing any running $(PythonExe) instances...</Message>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Midl>
@@ -206,6 +212,12 @@
       <IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <BaseAddress>0x1e000000</BaseAddress>
     </Link>
+    <PreBuildEvent>
+      <Command>$(KillPythonExe)</Command>
+    </PreBuildEvent>
+    <PreBuildEvent>
+      <Message>Killing any running $(PythonExe) instances...</Message>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -231,6 +243,12 @@
       <IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <BaseAddress>0x1e000000</BaseAddress>
     </Link>
+    <PreBuildEvent>
+      <Command>$(KillPythonExe)</Command>
+    </PreBuildEvent>
+    <PreBuildEvent>
+      <Message>Killing any running $(PythonExe) instances...</Message>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
@@ -259,6 +277,12 @@
       <IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <BaseAddress>0x1e000000</BaseAddress>
     </Link>
+    <PreBuildEvent>
+      <Command>$(KillPythonExe)</Command>
+    </PreBuildEvent>
+    <PreBuildEvent>
+      <Message>Killing any running $(PythonExe) instances...</Message>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
     <ClCompile>
@@ -282,6 +306,12 @@
       <IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <BaseAddress>0x1e000000</BaseAddress>
     </Link>
+    <PreBuildEvent>
+      <Command>$(KillPythonExe)</Command>
+    </PreBuildEvent>
+    <PreBuildEvent>
+      <Message>Killing any running $(PythonExe) instances...</Message>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
     <Midl>
@@ -308,6 +338,12 @@
       <BaseAddress>0x1e000000</BaseAddress>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
+    <PreBuildEvent>
+      <Command>$(KillPythonExe)</Command>
+    </PreBuildEvent>
+    <PreBuildEvent>
+      <Message>Killing any running $(PythonExe) instances...</Message>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
     <ClCompile>
@@ -331,6 +367,12 @@
       <IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <BaseAddress>0x1e000000</BaseAddress>
     </Link>
+    <PreBuildEvent>
+      <Command>$(KillPythonExe)</Command>
+    </PreBuildEvent>
+    <PreBuildEvent>
+      <Message>Killing any running $(PythonExe) instances...</Message>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
     <Midl>
@@ -357,6 +399,12 @@
       <BaseAddress>0x1e000000</BaseAddress>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
+    <PreBuildEvent>
+      <Command>$(KillPythonExe)</Command>
+    </PreBuildEvent>
+    <PreBuildEvent>
+      <Message>Killing any running $(PythonExe) instances...</Message>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="..\Include\abstract.h" />
diff --git a/Tools/buildbot/build-amd64.bat b/Tools/buildbot/build-amd64.bat
index 7ee7b2d..493e74d 100644
--- a/Tools/buildbot/build-amd64.bat
+++ b/Tools/buildbot/build-amd64.bat
@@ -2,6 +2,5 @@
 cmd /c Tools\buildbot\external-amd64.bat
 call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
 cmd /c Tools\buildbot\clean-amd64.bat
-msbuild PCbuild\kill_python.vcxproj /p:Configuration=Debug /p:PlatformTarget=x64
-PCbuild\amd64\kill_python_d.exe
+
 msbuild PCbuild\pcbuild.sln /p:Configuration=Debug /p:Platform=x64
diff --git a/Tools/buildbot/build.bat b/Tools/buildbot/build.bat
index c93cfd5..be79b10 100644
--- a/Tools/buildbot/build.bat
+++ b/Tools/buildbot/build.bat
@@ -2,7 +2,6 @@
 cmd /c Tools\buildbot\external.bat
 call "%VS100COMNTOOLS%vsvars32.bat"
 cmd /c Tools\buildbot\clean.bat
-msbuild PCbuild\kill_python.vcxproj /p:Configuration=Debug /p:PlatformTarget=x86
-PCbuild\kill_python_d.exe
+
 msbuild PCbuild\pcbuild.sln /p:Configuration=Debug /p:Platform=Win32
 
-- 
cgit v0.12