PublicArchive/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-05-19 02:44:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't run kill_python as part of the build process. Change the buildbots so they have to call it explicitly instead.

Browse Source
This commit is contained in:
Trent Nelson
2008-04-06 20:51:23 +00:00
parent 28112d0cb6
commit 5a4d66824a
4 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PCbuild/kill_python.vcproj
-8
View File
@@ -77,8 +77,6 @@
/>
<Tool
Name="VCPostBuildEventTool"
Description="Killing existing Python processes..."
CommandLine="&quot;$(KillPythonExe)&quot;"
/>
</Configuration>
<Configuration
@@ -140,8 +138,6 @@
/>
<Tool
Name="VCPostBuildEventTool"
Description="Killing existing Python processes..."
CommandLine="&quot;$(KillPythonExe)&quot;"
/>
</Configuration>
<Configuration
@@ -202,8 +198,6 @@
/>
<Tool
Name="VCPostBuildEventTool"
Description="Killing existing Python processes..."
CommandLine="&quot;$(KillPythonExe)&quot;"
/>
</Configuration>
<Configuration
@@ -265,8 +259,6 @@
/>
<Tool
Name="VCPostBuildEventTool"
Description="Killing existing Python processes..."
CommandLine="&quot;$(KillPythonExe)&quot;"
/>
</Configuration>
</Configurations>
PCbuild/pythoncore.vcproj
+16 -16
View File
@@ -58,8 +58,8 @@
/>
<Tool
Name="VCPreLinkEventTool"
Description="Generate build information and kill existing Python processes..."
CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release&#x0D;&#x0A;&quot;$(KillPythonExe)&quot;"
Description="Generate build information..."
CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"
/>
<Tool
Name="VCLinkerTool"
@@ -133,8 +133,8 @@
/>
<Tool
Name="VCPreLinkEventTool"
Description="Generate build information and kill existing Python processes..."
CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release&#x0D;&#x0A;&quot;$(KillPythonExe)&quot;"
Description="Generate build information..."
CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"
/>
<Tool
Name="VCLinkerTool"
@@ -211,8 +211,8 @@
/>
<Tool
Name="VCPreLinkEventTool"
Description="Generate build information and kill existing Python processes..."
CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Debug&#x0D;&#x0A;&quot;$(KillPythonExe)&quot;"
Description="Generate build information..."
CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Debug"
/>
<Tool
Name="VCLinkerTool"
@@ -289,8 +289,8 @@
/>
<Tool
Name="VCPreLinkEventTool"
Description="Generate build information and kill existing Python processes..."
CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Debug&#x0D;&#x0A;&quot;$(KillPythonExe)&quot;"
Description="Generate build information..."
CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Debug"
/>
<Tool
Name="VCLinkerTool"
@@ -363,8 +363,8 @@
/>
<Tool
Name="VCPreLinkEventTool"
Description="Generate build information and kill existing Python processes..."
CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release&#x0D;&#x0A;&quot;$(KillPythonExe)&quot;"
Description="Generate build information..."
CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"
/>
<Tool
Name="VCLinkerTool"
@@ -438,8 +438,8 @@
/>
<Tool
Name="VCPreLinkEventTool"
Description="Generate build information and kill existing Python processes..."
CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release&#x0D;&#x0A;&quot;$(KillPythonExe)&quot;"
Description="Generate build information..."
CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"
/>
<Tool
Name="VCLinkerTool"
@@ -513,8 +513,8 @@
/>
<Tool
Name="VCPreLinkEventTool"
Description="Generate build information and kill existing Python processes..."
CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release&#x0D;&#x0A;&quot;$(KillPythonExe)&quot;"
Description="Generate build information..."
CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"
/>
<Tool
Name="VCLinkerTool"
@@ -588,8 +588,8 @@
/>
<Tool
Name="VCPreLinkEventTool"
Description="Generate build information and kill existing Python processes..."
CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release&#x0D;&#x0A;&quot;$(KillPythonExe)&quot;"
Description="Generate build information..."
CommandLine="&quot;$(SolutionDir)make_buildinfo.exe&quot; Release"
/>
<Tool
Name="VCLinkerTool"
Tools/buildbot/build-amd64.bat
+1
View File
@@ -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"
Tools/buildbot/build.bat
+1
View File
@@ -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"