Mercurial > cpython-lru_cache-weakref
diff PCbuild/pythoncore.vcproj @ 46273:9dcda56b871e legacy-trunk
Reimplement kill_python. The existing version had a number of flaws, namely, it didn't work for x64 and it wasn't precise about which python_d.exe it was killing -- it just killed the first one it came across that happened to have 'pcbuild\python_d.exe' or 'build\python_d.exe' in it's path. The new version has been rewritten from the ground up and now lives in PCbuild, instead of Tools\buildbot, and it has also been incorporated into the Visual Studio solution (pcbuild.sln) as 'kill_python'. The solution has also been altered such that kill_python is called where necessary in the build process in order to prevent any linking errors due to open file locks. In lieu of this, all of the existing bits and pieces in Tools\buildbot that called out to kill_python at various points have also been removed as they are now obsolete. Tested on both Win32 and x64.
Change set (included to improve usefulness of svnmerge log entry):
M PCbuild\pythoncore.vcproj
M PCbuild\pcbuild.sln
M PCbuild\release.vsprops
A PCbuild\kill_python.vcproj
M PCbuild\debug.vsprops
A PCbuild\kill_python.c
D Tools\buildbot\kill_python.bat
D Tools\buildbot\kill_python.mak
M Tools\buildbot\build.bat
D Tools\buildbot\Makefile
M Tools\buildbot\build-amd64.bat
M Tools\buildbot\buildmsi.bat
D Tools\buildbot\kill_python.c
| author | Trent Nelson <trent.nelson@snakebite.org> |
|---|---|
| date | Thu, 03 Apr 2008 18:27:06 +0000 |
| parents | ef40ec32c5e4 |
| children | e28ed85cc962 |
line wrap: on
line diff
--- a/PCbuild/pythoncore.vcproj Thu Apr 03 15:39:17 2008 +0000 +++ b/PCbuild/pythoncore.vcproj Thu Apr 03 18:27:06 2008 +0000 @@ -58,8 +58,8 @@ /> <Tool Name="VCPreLinkEventTool" - Description="generate buildinfo" - CommandLine=""$(SolutionDir)make_buildinfo.exe" $(ConfigurationName)" + Description="Generate build information and kill existing Python processes..." + CommandLine=""$(SolutionDir)make_buildinfo.exe" Release
"$(KillPythonExe)"" /> <Tool Name="VCLinkerTool" @@ -133,8 +133,8 @@ /> <Tool Name="VCPreLinkEventTool" - Description="generate buildinfo" - CommandLine="$(SolutionDir)make_buildinfo.exe $(ConfigurationName)" + Description="Generate build information and kill existing Python processes..." + CommandLine=""$(SolutionDir)make_buildinfo.exe" Release
"$(KillPythonExe)"" /> <Tool Name="VCLinkerTool" @@ -211,8 +211,8 @@ /> <Tool Name="VCPreLinkEventTool" - Description="generate buildinfo" - CommandLine=""$(SolutionDir)make_buildinfo.exe" $(ConfigurationName)" + Description="Generate build information and kill existing Python processes..." + CommandLine=""$(SolutionDir)make_buildinfo.exe" Debug
"$(KillPythonExe)"" /> <Tool Name="VCLinkerTool" @@ -289,8 +289,8 @@ /> <Tool Name="VCPreLinkEventTool" - Description="generate buildinfo" - CommandLine="$(SolutionDir)make_buildinfo.exe $(ConfigurationName)" + Description="Generate build information and kill existing Python processes..." + CommandLine=""$(SolutionDir)make_buildinfo.exe" Debug
"$(KillPythonExe)"" /> <Tool Name="VCLinkerTool" @@ -363,8 +363,8 @@ /> <Tool Name="VCPreLinkEventTool" - Description="generate buildinfo" - CommandLine="$(SolutionDir)make_buildinfo.exe Release" + Description="Generate build information and kill existing Python processes..." + CommandLine=""$(SolutionDir)make_buildinfo.exe" Release
"$(KillPythonExe)"" /> <Tool Name="VCLinkerTool" @@ -438,8 +438,8 @@ /> <Tool Name="VCPreLinkEventTool" - Description="generate buildinfo" - CommandLine="$(SolutionDir)make_buildinfo.exe $(ConfigurationName)" + Description="Generate build information and kill existing Python processes..." + CommandLine=""$(SolutionDir)make_buildinfo.exe" Release
"$(KillPythonExe)"" /> <Tool Name="VCLinkerTool" @@ -513,8 +513,8 @@ /> <Tool Name="VCPreLinkEventTool" - Description="generate buildinfo" - CommandLine="$(SolutionDir)make_buildinfo.exe Release" + Description="Generate build information and kill existing Python processes..." + CommandLine=""$(SolutionDir)make_buildinfo.exe" Release
"$(KillPythonExe)"" /> <Tool Name="VCLinkerTool" @@ -588,8 +588,8 @@ /> <Tool Name="VCPreLinkEventTool" - Description="generate buildinfo" - CommandLine="$(SolutionDir)make_buildinfo.exe $(ConfigurationName)" + Description="Generate build information and kill existing Python processes..." + CommandLine=""$(SolutionDir)make_buildinfo.exe" Release
"$(KillPythonExe)"" /> <Tool Name="VCLinkerTool"