diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2014-12-12 20:18:11 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2014-12-12 20:18:11 (GMT) |
| commit | 10e65856a38f888108f1063970b2fa3077af01f8 (patch) | |
| tree | 1628bf6c719a3d47ec0e23ff54487d01bf1cfee1 | |
| parent | 5632aff9c13408faaa410bb8cbfd7470f8bd0587 (diff) | |
| download | cpython-10e65856a38f888108f1063970b2fa3077af01f8.zip cpython-10e65856a38f888108f1063970b2fa3077af01f8.tar.gz cpython-10e65856a38f888108f1063970b2fa3077af01f8.tar.bz2 | |
Removes use of ValueOrDefault function that is not always available on the buildbots.
| -rw-r--r-- | PCbuild/pyproject.props | 3 | ||||
| -rw-r--r-- | Tools/buildbot/clean.bat | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index 3203867..1130503 100644 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -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> diff --git a/Tools/buildbot/clean.bat b/Tools/buildbot/clean.bat index 39fec01..09328bc 100644 --- a/Tools/buildbot/clean.bat +++ b/Tools/buildbot/clean.bat @@ -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" |