summaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2013-11-26 22:32:59 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2013-11-26 22:32:59 (GMT)
commitbb65b5bf1dcc17519e4173ecb64a86228cc5cb58 (patch)
tree5c9c769b6c704ccf8aa7b7a096e5a34b825348d6 /Tools
parent99fb0513ddf8b0315ed717d08ced1fa28d144f05 (diff)
downloadcpython-bb65b5bf1dcc17519e4173ecb64a86228cc5cb58.zip
cpython-bb65b5bf1dcc17519e4173ecb64a86228cc5cb58.tar.gz
cpython-bb65b5bf1dcc17519e4173ecb64a86228cc5cb58.tar.bz2
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.
Diffstat (limited to 'Tools')
-rw-r--r--Tools/buildbot/build-amd64.bat3
-rw-r--r--Tools/buildbot/build.bat3
2 files changed, 2 insertions, 4 deletions
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