[Python-checkins] cpython: Removes use of ValueOrDefault function that is not always available on the

[steve.dower]

https://hg.python.org/cpython/rev/69d4809688f9
changeset:   93862:69d4809688f9
parent:      93860:4c47868369b5
user:        Steve Dower <steve.dower at microsoft.com>
date:        Fri Dec 12 12:18:11 2014 -0800
summary:
  Removes use of ValueOrDefault function that is not always available on the buildbots.

files:
  PCbuild/pyproject.props  |  3 ++-
  Tools/buildbot/clean.bat |  2 +-
  2 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -118,7 +118,8 @@
       </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
--- a/Tools/buildbot/clean.bat
+++ b/Tools/buildbot/clean.bat
@@ -16,7 +16,7 @@
 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"

-- 
Repository URL: https://hg.python.org/cpython