diff options
| author | Trent Nelson <trent.nelson@snakebite.org> | 2008-04-03 20:47:30 +0000 |
|---|---|---|
| committer | Trent Nelson <trent.nelson@snakebite.org> | 2008-04-03 20:47:30 +0000 |
| commit | 61828c725aa7324cb192ca9486de464c58b5871f (patch) | |
| tree | 21a68814a5666299233fd2c0eb7b726509475b09 /Tools/buildbot/build.bat | |
| parent | f12e5411743fe1a2c43efe90c906c1f330b0f1f9 (diff) | |
| download | cpython-git-61828c725aa7324cb192ca9486de464c58b5871f.tar.gz | |
Merged revisions 62129,62131,62133 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r62129 | trent.nelson | 2008-04-03 19:27:06 +0100 (Thu, 03 Apr 2008) | 16 lines
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
........
r62131 | trent.nelson | 2008-04-03 19:48:53 +0100 (Thu, 03 Apr 2008) | 1 line
Add the correct OutputFile values for debug builds. Fixes r62129's commit.
........
r62133 | trent.nelson | 2008-04-03 21:00:08 +0100 (Thu, 03 Apr 2008) | 1 line
Make kill_python a little more forgiving if it can't obtain a snapshot of module information for a given python[_d].exe process. Failing here was too pessimistic; the python[_d].exe process may be owned by another user, which is the case in some buildbot environments.
........
Diffstat (limited to 'Tools/buildbot/build.bat')
| -rw-r--r-- | Tools/buildbot/build.bat | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Tools/buildbot/build.bat b/Tools/buildbot/build.bat index 508798125a..6bac3edbeb 100644 --- a/Tools/buildbot/build.bat +++ b/Tools/buildbot/build.bat @@ -1,7 +1,6 @@ @rem Used by the buildbot "compile" step. cmd /c Tools\buildbot\external.bat call "%VS90COMNTOOLS%vsvars32.bat" -cmd /q/c Tools\buildbot\kill_python.bat cmd /c Tools\buildbot\clean.bat vcbuild /useenv PCbuild\pcbuild.sln "Debug|Win32" |