languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-10-14 12:48:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removes use of ValueOrDefault function that is not always available on the buildbots.

Browse source
This commit is contained in:
Steve Dower 2014-12-12 12:18:11 -08:00
parent 5632aff9c1
commit 10e65856a3
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
PCbuild/pyproject.props
View file

@ -118,7 +118,8 @@ foreach (System.Diagnostics.Process p in System.Diagnostics.Process.GetProcesses
</Code>
</Task>
</UsingTask>
<Target Name="KillPython" BeforeTargets="InitializeBuildStatus" Condition="$([msbuild]::ValueOrDefault($(KillPython), 'false'))">
<Target Name="KillPython" BeforeTargets="InitializeBuildStatus" Condition="'$(KillPython)' == 'true'">
<Message Text="Killing any running python.exe instances..." Importance="high" />
<KillPython FileName="$(OutDir)python$(PyDebugExt).exe" />
</Target>

2
Tools/buildbot/clean.bat
View file

@ -16,7 +16,7 @@ if "%1" == "x64" (
call "%pcbuild%\env.bat" %vcvars_target%
echo.Attempting to kill Pythons...
msbuild /v:m /nologo /target:KillPython "%pcbuild%\pythoncore.vcxproj" /p:Configuration=Release /p:Platform=%platform%
msbuild /v:m /nologo /target:KillPython "%pcbuild%\pythoncore.vcxproj" /p:Configuration=Release /p:Platform=%platform% /p:KillPython=true
echo Deleting .pyc/.pyo files ...
del /s "%root%\Lib\*.pyc" "%root%\Lib\*.pyo"