Kaydet (Commit) 5a4d6682 authored tarafından Trent Nelson's avatar Trent Nelson

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

Don't run kill_python as part of the build process.  Change the buildbots so they have to call it explicitly instead.
üst 28112d0c
...@@ -77,8 +77,6 @@ ...@@ -77,8 +77,6 @@
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
Description="Killing existing Python processes..."
CommandLine="&quot;$(KillPythonExe)&quot;"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
...@@ -140,8 +138,6 @@ ...@@ -140,8 +138,6 @@
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
Description="Killing existing Python processes..."
CommandLine="&quot;$(KillPythonExe)&quot;"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
...@@ -202,8 +198,6 @@ ...@@ -202,8 +198,6 @@
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
Description="Killing existing Python processes..."
CommandLine="&quot;$(KillPythonExe)&quot;"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
...@@ -265,8 +259,6 @@ ...@@ -265,8 +259,6 @@
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
Description="Killing existing Python processes..."
CommandLine="&quot;$(KillPythonExe)&quot;"
/> />
</Configuration> </Configuration>
</Configurations> </Configurations>
......
...@@ -58,8 +58,8 @@ ...@@ -58,8 +58,8 @@
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
Description="Generate build information and kill existing Python processes..." Description="Generate build information..."
CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release&#x0D;&#x0A;&quot;$(KillPythonExe)&quot;" CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
...@@ -133,8 +133,8 @@ ...@@ -133,8 +133,8 @@
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
Description="Generate build information and kill existing Python processes..." Description="Generate build information..."
CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release&#x0D;&#x0A;&quot;$(KillPythonExe)&quot;" CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
...@@ -211,8 +211,8 @@ ...@@ -211,8 +211,8 @@
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
Description="Generate build information and kill existing Python processes..." Description="Generate build information..."
CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Debug&#x0D;&#x0A;&quot;$(KillPythonExe)&quot;" CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Debug"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
...@@ -289,8 +289,8 @@ ...@@ -289,8 +289,8 @@
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
Description="Generate build information and kill existing Python processes..." Description="Generate build information..."
CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Debug&#x0D;&#x0A;&quot;$(KillPythonExe)&quot;" CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Debug"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
...@@ -363,8 +363,8 @@ ...@@ -363,8 +363,8 @@
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
Description="Generate build information and kill existing Python processes..." Description="Generate build information..."
CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release&#x0D;&#x0A;&quot;$(KillPythonExe)&quot;" CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
...@@ -438,8 +438,8 @@ ...@@ -438,8 +438,8 @@
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
Description="Generate build information and kill existing Python processes..." Description="Generate build information..."
CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release&#x0D;&#x0A;&quot;$(KillPythonExe)&quot;" CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
...@@ -513,8 +513,8 @@ ...@@ -513,8 +513,8 @@
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
Description="Generate build information and kill existing Python processes..." Description="Generate build information..."
CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release&#x0D;&#x0A;&quot;$(KillPythonExe)&quot;" CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
...@@ -588,8 +588,8 @@ ...@@ -588,8 +588,8 @@
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
Description="Generate build information and kill existing Python processes..." Description="Generate build information..."
CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release&#x0D;&#x0A;&quot;$(KillPythonExe)&quot;" CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
......
...@@ -2,4 +2,5 @@ ...@@ -2,4 +2,5 @@
cmd /c Tools\buildbot\external-amd64.bat cmd /c Tools\buildbot\external-amd64.bat
call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64 call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
cmd /c Tools\buildbot\clean-amd64.bat 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" vcbuild PCbuild\pcbuild.sln "Debug|x64"
...@@ -2,5 +2,6 @@ ...@@ -2,5 +2,6 @@
cmd /c Tools\buildbot\external.bat cmd /c Tools\buildbot\external.bat
call "%VS90COMNTOOLS%vsvars32.bat" call "%VS90COMNTOOLS%vsvars32.bat"
cmd /c Tools\buildbot\clean.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" vcbuild /useenv PCbuild\pcbuild.sln "Debug|Win32"
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