3 Commits

Author	SHA1	Message	Date
Martin v. Löwis	3c6938d22b	Ran svneol.py	2008-06-13 23:34:35 +00:00
Martin v. Löwis	d218dc15e6	Merged revisions 62177-62178,62180-62193 via svnmerge from ... svn+ssh://pythondev@svn.python.org/python/trunk ........ r62177 | skip.montanaro | 2008-04-05 21:47:47 +0200 (Sa, 05 Apr 2008) | 2 lines Declare inittimezone static. ........ r62180 | mark.hammond | 2008-04-06 03:42:06 +0200 (So, 06 Apr 2008) | 4 lines From issue 1753245 - better _winreg support for x64. Adds _winreg.DisableReflectionKey, EnableReflectionKey, QueryReflectionKey, KEY_WOW64_64KEY and KEY_WOW64_32KEY. ........ r62187 | skip.montanaro | 2008-04-06 19:05:57 +0200 (So, 06 Apr 2008) | 1 line type ........ r62193 | trent.nelson | 2008-04-06 22:51:23 +0200 (So, 06 Apr 2008) | 1 line Don't run kill_python as part of the build process. Change the buildbots so they have to call it explicitly instead. ........	2008-04-07 03:17:54 +00:00
Trent Nelson	61828c725a	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. ........	2008-04-03 20:47:30 +00:00