Merge pull request #98 from Microsoft/master

python 2.7 is now looked for the same way other dependencies are.

Improves logging as well by providing minimal console output during
build, while providing a file logger with additional details.

utils/hct/hctbuild.cmd

@@ -227,7 +227,8 @@ rem 3 - build directory
 setlocal
 call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %BUILD_TOOLS%
 rem Add /ds for a detailed summary at the end.
-MSBuild.exe /property:Configuration=%1 /property:Platform=%2 /maxcpucount %3\LLVM.sln
+echo Logging to %3\msbuild-log.txt
+MSBuild.exe /nologo /property:Configuration=%1 /property:Platform=%2 /maxcpucount %3\LLVM.sln /consoleloggerparameters:Summary;Verbosity=minimal /fileloggerparameters:LogFile=%3\msbuild-log.txt
 if NOT "%ERRORLEVEL%"=="0" (
   exit /b 1
 )

utils/hct/hctstart.cmd

@@ -85,6 +85,11 @@ if errorlevel 1 (
   echo WARNING: cmake version is not supported. Your build may fail.
 )
 
+where python.exe 1>nul 2>nul
+if errorlevel 1 (
+  call :findpython
+)
+
 where te.exe 1>nul 2>nul
 if errorlevel 1 (
   call :findte
@@ -150,6 +155,16 @@ if errorlevel 1 (
 echo Path adjusted to include git.
 goto :eof
 
+:findpython
+if exist C:\Python27\python.exe set path=%path%;C:\Python27
+where python.exe 1>nul 2>nul
+if errorlevel 1 (
+  echo Unable to find python.
+  exit /b 1
+)
+echo Path adjusted to include python.
+goto :eof
+
 :checksdk
 setlocal
 reg query "HKLM\SOFTWARE\Microsoft\Windows Kits\Installed Roots" /v KitsRoot10 1>nul
@@ -163,6 +178,14 @@ if not exist "%kit_root%" (
   echo Windows 10 SDK was installed but is not accessible.
   exit /b 1
 )
+rem SDK version 10586 and 14393 will also work properly, but we use 10240 as
+rem canonical for now.
+if exist "%kit_root%\include\10.0.10586.0\um\d3d12.h" (
+  goto :eof
+)
+if exist "%kit_root%\include\10.0.14393.0\um\d3d12.h" (
+  goto :eof
+)
 if not exist  "%kit_root%\include\10.0.10240.0\um\d3d12.h" (
   echo Unable to find include files for Windows 10 SDK 10.0.10240.0.
   echo   file "%kit_root%\include\10.0.10240.0\um\d3d12.h" does not exist