traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Zachary Ware 2013-11-26 16:32:59 -06:00
parent 99fb0513dd
commit bb65b5bf1d
4 changed files with 54 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Misc/NEWS
View File

@ -92,6 +92,10 @@ Documentation
Build
-----
- 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.
- Add workaround for VS 2010 nmake clean issue. VS 2010 doesn't set up PATH
for nmake.exe correctly.

48
PCbuild/pythoncore.vcxproj
View File

@ -181,6 +181,12 @@
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<BaseAddress>0x1e000000</BaseAddress>
</Link>
<PreBuildEvent>
<Command>$(KillPythonExe)</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Killing any running $(PythonExe) instances...</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl>
@ -206,6 +212,12 @@
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<BaseAddress>0x1e000000</BaseAddress>
</Link>
<PreBuildEvent>
<Command>$(KillPythonExe)</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Killing any running $(PythonExe) instances...</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@ -231,6 +243,12 @@
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<BaseAddress>0x1e000000</BaseAddress>
</Link>
<PreBuildEvent>
<Command>$(KillPythonExe)</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Killing any running $(PythonExe) instances...</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Midl>
@ -259,6 +277,12 @@
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<BaseAddress>0x1e000000</BaseAddress>
</Link>
<PreBuildEvent>
<Command>$(KillPythonExe)</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Killing any running $(PythonExe) instances...</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
<ClCompile>
@ -282,6 +306,12 @@
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<BaseAddress>0x1e000000</BaseAddress>
</Link>
<PreBuildEvent>
<Command>$(KillPythonExe)</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Killing any running $(PythonExe) instances...</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
<Midl>
@ -308,6 +338,12 @@
<BaseAddress>0x1e000000</BaseAddress>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<PreBuildEvent>
<Command>$(KillPythonExe)</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Killing any running $(PythonExe) instances...</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
<ClCompile>
@ -331,6 +367,12 @@
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<BaseAddress>0x1e000000</BaseAddress>
</Link>
<PreBuildEvent>
<Command>$(KillPythonExe)</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Killing any running $(PythonExe) instances...</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
<Midl>
@ -357,6 +399,12 @@
<BaseAddress>0x1e000000</BaseAddress>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<PreBuildEvent>
<Command>$(KillPythonExe)</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Killing any running $(PythonExe) instances...</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\Include\abstract.h" />

3
Tools/buildbot/build-amd64.bat
View File

@ -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

3
Tools/buildbot/build.bat
View File

@ -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