Commit 7b96944
build,win: fix python detection script
Handle spaces in the path to python.exe, in case it is installed
under some directory like "C:\Program Files".
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>1 parent 9f50db2 commit 7b96944
2 files changed
Lines changed: 3 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -41,7 +41,7 @@ EXIT /B 1 | |||
| 41 | 41 | :validate | |
| 42 | 42 | IF NOT EXIST "%p%python.exe" EXIT /B 1 | |
| 43 | 43 | :: Check if %p% is python2 | |
| 44 | - %p%python.exe -V 2>&1 | findstr /R "^Python.2.*" > NUL | ||
| 44 | + "%p%python.exe" -V 2>&1 | findstr /R "^Python.2.*" > NUL | ||
| 45 | 45 | IF ERRORLEVEL 1 EXIT /B %ERRORLEVEL% | |
| 46 | 46 | :: We can wrap it up | |
| 47 | 47 | ENDLOCAL & SET pt=%p%& SET need_path_ext=%need_path% | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -528,7 +528,7 @@ goto exit | |||
| 528 | 528 | :run-python | |
| 529 | 529 | call tools\msvs\find_python.cmd | |
| 530 | 530 | if errorlevel 1 echo Could not find python2 & goto :exit | |
| 531 | - set cmd1=%VCBUILD_PYTHON_LOCATION% %* | ||
| 531 | + set cmd1="%VCBUILD_PYTHON_LOCATION%" %* | ||
| 532 | 532 | echo %cmd1% | |
| 533 | 533 | %cmd1% | |
| 534 | 534 | exit /b %ERRORLEVEL% | |
@@ -547,7 +547,7 @@ set TAG= | |||
| 547 | 547 | set FULLVERSION= | |
| 548 | 548 | :: Call as subroutine for validation of python | |
| 549 | 549 | call :run-python tools\getnodeversion.py > nul | |
| 550 | - for /F "tokens=*" %%i in ('%VCBUILD_PYTHON_LOCATION% tools\getnodeversion.py') do set NODE_VERSION=%%i | ||
| 550 | + for /F "tokens=*" %%i in ('"%VCBUILD_PYTHON_LOCATION%" tools\getnodeversion.py') do set NODE_VERSION=%%i | ||
| 551 | 551 | if not defined NODE_VERSION ( | |
| 552 | 552 | echo Cannot determine current version of Node.js | |
| 553 | 553 | exit /b 1 | |
0 commit comments