diff options
| author | Trent Nelson <trent.nelson@snakebite.org> | 2008-04-06 20:51:23 (GMT) |
|---|---|---|
| committer | Trent Nelson <trent.nelson@snakebite.org> | 2008-04-06 20:51:23 (GMT) |
| commit | 5a4d66824adeeef2d4d4b1bb4cc6cc9645fae8a0 (patch) | |
| tree | dc5efee482ee2e75f3795266730e4272081327a5 | |
| parent | 28112d0cb608e5d2ef8820dce8100ee3c9bb1692 (diff) | |
| download | cpython-5a4d66824adeeef2d4d4b1bb4cc6cc9645fae8a0.zip cpython-5a4d66824adeeef2d4d4b1bb4cc6cc9645fae8a0.tar.gz cpython-5a4d66824adeeef2d4d4b1bb4cc6cc9645fae8a0.tar.bz2 | |
Don't run kill_python as part of the build process. Change the buildbots so they have to call it explicitly instead.
| -rw-r--r-- | PCbuild/kill_python.vcproj | 8 | ||||
| -rw-r--r-- | PCbuild/pythoncore.vcproj | 32 | ||||
| -rw-r--r-- | Tools/buildbot/build-amd64.bat | 1 | ||||
| -rw-r--r-- | Tools/buildbot/build.bat | 1 |
4 files changed, 18 insertions, 24 deletions
diff --git a/PCbuild/kill_python.vcproj b/PCbuild/kill_python.vcproj index 9f11075..a34107a 100644 --- a/PCbuild/kill_python.vcproj +++ b/PCbuild/kill_python.vcproj @@ -77,8 +77,6 @@ />
<Tool
Name="VCPostBuildEventTool"
- Description="Killing existing Python processes..."
- CommandLine=""$(KillPythonExe)""
/>
</Configuration>
<Configuration
@@ -140,8 +138,6 @@ />
<Tool
Name="VCPostBuildEventTool"
- Description="Killing existing Python processes..."
- CommandLine=""$(KillPythonExe)""
/>
</Configuration>
<Configuration
@@ -202,8 +198,6 @@ />
<Tool
Name="VCPostBuildEventTool"
- Description="Killing existing Python processes..."
- CommandLine=""$(KillPythonExe)""
/>
</Configuration>
<Configuration
@@ -265,8 +259,6 @@ />
<Tool
Name="VCPostBuildEventTool"
- Description="Killing existing Python processes..."
- CommandLine=""$(KillPythonExe)""
/>
</Configuration>
</Configurations>
diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj index 5e14ef7..9683bd1 100644 --- a/PCbuild/pythoncore.vcproj +++ b/PCbuild/pythoncore.vcproj @@ -58,8 +58,8 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Generate build information and kill existing Python processes..." - CommandLine=""$(SolutionDir)make_buildinfo.exe" Release
"$(KillPythonExe)"" + Description="Generate build information..." + CommandLine=""$(SolutionDir)make_buildinfo.exe" Release" /> <Tool Name="VCLinkerTool" @@ -133,8 +133,8 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Generate build information and kill existing Python processes..." - CommandLine=""$(SolutionDir)make_buildinfo.exe" Release
"$(KillPythonExe)"" + Description="Generate build information..." + CommandLine=""$(SolutionDir)make_buildinfo.exe" Release" /> <Tool Name="VCLinkerTool" @@ -211,8 +211,8 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Generate build information and kill existing Python processes..." - CommandLine=""$(SolutionDir)make_buildinfo.exe" Debug
"$(KillPythonExe)"" + Description="Generate build information..." + CommandLine=""$(SolutionDir)make_buildinfo.exe" Debug" /> <Tool Name="VCLinkerTool" @@ -289,8 +289,8 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Generate build information and kill existing Python processes..." - CommandLine=""$(SolutionDir)make_buildinfo.exe" Debug
"$(KillPythonExe)"" + Description="Generate build information..." + CommandLine=""$(SolutionDir)make_buildinfo.exe" Debug" /> <Tool Name="VCLinkerTool" @@ -363,8 +363,8 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Generate build information and kill existing Python processes..." - CommandLine=""$(SolutionDir)make_buildinfo.exe" Release
"$(KillPythonExe)"" + Description="Generate build information..." + CommandLine=""$(SolutionDir)make_buildinfo.exe" Release" /> <Tool Name="VCLinkerTool" @@ -438,8 +438,8 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Generate build information and kill existing Python processes..." - CommandLine=""$(SolutionDir)make_buildinfo.exe" Release
"$(KillPythonExe)"" + Description="Generate build information..." + CommandLine=""$(SolutionDir)make_buildinfo.exe" Release" /> <Tool Name="VCLinkerTool" @@ -513,8 +513,8 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Generate build information and kill existing Python processes..." - CommandLine=""$(SolutionDir)make_buildinfo.exe" Release
"$(KillPythonExe)"" + Description="Generate build information..." + CommandLine=""$(SolutionDir)make_buildinfo.exe" Release" /> <Tool Name="VCLinkerTool" @@ -588,8 +588,8 @@ /> <Tool Name="VCPreLinkEventTool" - Description="Generate build information and kill existing Python processes..." - CommandLine=""$(SolutionDir)make_buildinfo.exe" Release
"$(KillPythonExe)"" + Description="Generate build information..." + CommandLine=""$(SolutionDir)make_buildinfo.exe" Release" /> <Tool Name="VCLinkerTool" diff --git a/Tools/buildbot/build-amd64.bat b/Tools/buildbot/build-amd64.bat index 1d828eb..5175c62 100644 --- a/Tools/buildbot/build-amd64.bat +++ b/Tools/buildbot/build-amd64.bat @@ -2,4 +2,5 @@ cmd /c Tools\buildbot\external-amd64.bat call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64 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" diff --git a/Tools/buildbot/build.bat b/Tools/buildbot/build.bat index 6bac3ed..ab3ea7d 100644 --- a/Tools/buildbot/build.bat +++ b/Tools/buildbot/build.bat @@ -2,5 +2,6 @@ cmd /c Tools\buildbot\external.bat call "%VS90COMNTOOLS%vsvars32.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" |