build,win: fix python detection script

jasongin · MylesBorins · commit 325813ea97ff · 2017-09-05T12:49:51.000-04:00
Handle spaces in the path to python.exe, in case it is installed under some directory like "C:\Program Files". Backport-PR-URL: #14842 PR-URL: #14546 Reviewed-By: Timothy Gu <timothygu99@gmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net>
diff --git a/tools/msvs/find_python.cmd b/tools/msvs/find_python.cmd
@@ -41,7 +41,7 @@ EXIT /B 1
 :validate
 IF NOT EXIST "%p%python.exe" EXIT /B 1
 :: Check if %p% is python2
-%p%python.exe -V 2>&1 | findstr /R "^Python.2.*" > NUL
+"%p%python.exe" -V 2>&1 | findstr /R "^Python.2.*" > NUL
 IF ERRORLEVEL 1 EXIT /B %ERRORLEVEL%
 :: We can wrap it up
 ENDLOCAL & SET pt=%p%& SET need_path_ext=%need_path%
diff --git a/vcbuild.bat b/vcbuild.bat
@@ -378,7 +378,7 @@ goto exit
 :run-python
 call tools\msvs\find_python.cmd
 if errorlevel 1 echo Could not find python2 & goto :exit
-set cmd1=%VCBUILD_PYTHON_LOCATION% %*
+set cmd1="%VCBUILD_PYTHON_LOCATION%" %*
 echo %cmd1%
 %cmd1%
 exit /b %ERRORLEVEL%
@@ -396,7 +396,7 @@ set TAG=
 set FULLVERSION=
 :: Call as subroutine for validation of python
 call :run-python tools\getnodeversion.py > nul
-for /F "tokens=*" %%i in ('%VCBUILD_PYTHON_LOCATION% tools\getnodeversion.py') do set NODE_VERSION=%%i
+for /F "tokens=*" %%i in ('"%VCBUILD_PYTHON_LOCATION%" tools\getnodeversion.py') do set NODE_VERSION=%%i
 if not defined NODE_VERSION (
   echo Cannot determine current version of Node.js
   exit /b 1
