build,windows: implement PEP514 python detection

PR-URL: #13900Fixes: #13882 Reviewed-By: Tobias Nießen <[email protected]>

Author: refack

tools/msvs/find_python.cmd

@@ -0,0 +1,51 @@
+@IF NOT DEFINED DEBUG_HELPER @ECHOOFF
+SETLOCAL
+:: If python.exe is in %Path%, just validate
+FOR /F "delims="%%aIN ('where python 2^>NUL') DO (
+SETneed_path=0
+SETp=%%~dpa
+IFNOTERRORLEVEL1GOTO :validate
+)
+
+:: Query the 3 locations mentioned in PEP 514 for a python2 InstallPath
+FOR%%KIN ( "HKCU\Software", "HKLM\SOFTWARE", "HKLM\Software\Wow6432Node") DO (
+SETneed_path=1
+CALL :find-main-branch%%K
+:: If validate returns 0 just jump to the end
+IFNOTERRORLEVEL1GOTO :validate
+)
+EXIT /B 1
+
+:: Helper subroutine to handle quotes in %1
+:find-main-branch
+SETmain_key="%~1\Python\PythonCore"
+REGQUERY%main_key% /s |findstr"2."|findstr InstallPath >NUL2>NUL
+IFNOTERRORLEVEL1CALL :find-key%main_key%
+EXIT /B
+
+:: Query registry sub-tree for InstallPath
+:find-key
+FOR /F "delims="%%aIN ('REG QUERY%1 /s ^| findstr"2."^| findstr InstallPath') DOIFNOTERRORLEVEL1CALL :find-path%%a
+EXIT /B
+
+:: Parse the value of %1 as the path for python.exe
+:find-path
+FOR /F "tokens=3*"%%aIN ('REG QUERY%1 /ve') DO (
+SETpt=%%a
+IFNOTERRORLEVEL1SETp=%pt%
+EXIT /B 0
+)
+EXIT /B 1
+
+:: Check if %p% holds a path to a real python2 executable
+:validate
+IFNOTEXIST"%p%python.exe"EXIT /B 1
+:: Check if %p% is python2
+%p%python.exe -V 2>&1 |findstr /R "^Python.2.*">NUL
+IFERRORLEVEL1EXIT /B %ERRORLEVEL%
+:: We can wrap it up
+ENDLOCAL&SETpt=%p%&SETneed_path_ext=%need_path%
+SETVCBUILD_PYTHON_LOCATION=%pt%python.exe
+IF%need_path_ext%==1SETPath=%Path%;%pt%
+SETneed_path_ext=
+EXIT /B %ERRORLEVEL%

vcbuild.bat

@@ -222,8 +222,7 @@ goto run
 ifdefined noprojgen goto msbuild
 
 @rem Generate the VS project.
-echo configure %configure_flags% --dest-cpu=%target_arch% --tag=%TAG%
-python configure %configure_flags% --dest-cpu=%target_arch% --tag=%TAG%
+call :run-python configure %configure_flags% --dest-cpu=%target_arch% --tag=%TAG%
 iferrorlevel1goto create-msvs-files-failed
 ifnotexist node.sln goto create-msvs-files-failed
 echo Project files generated.
@@ -408,7 +407,7 @@ if defined test_node_inspect goto node-test-inspect
 goto node-tests
 
 :node-check-deopts
-python tools\test.py --mode=release --check-deopts parallel sequential -J
+call :run-python tools\test.py --mode=release --check-deopts parallel sequential -J
 ifdefined test_node_inspect goto node-test-inspect
 goto node-tests
 
@@ -423,8 +422,7 @@ if "%config%"=="Debug" set test_args=--mode=debug %test_args%
 if"%config%"=="Release"settest_args=--mode=release %test_args%
 echo running 'cctest %cctest_args%'
 "%config%\cctest"%cctest_args%
-echo running 'python tools\test.py %test_args%'
-python tools\test.py %test_args%
+call :run-python tools\test.py %test_args%
 goto cpplint
 
 :cpplint
@@ -442,8 +440,8 @@ test\gc\binding.cc tools\icu\*.cc tools\icu\*.h') do (
 ( endlocal
 setcppfilelist=%localcppfilelist%
 )
-python tools/cpplint.py %cppfilelist%
-python tools/check-imports.py
+call :run-python tools/cpplint.py %cppfilelist%
+call :run-python tools/check-imports.py
 goto jslint
 
 :add-to-list
@@ -502,6 +500,14 @@ echo vcbuild.bat build-release : builds the release distribution as used by n
 echo vcbuild.bat enable-vtune : builds nodejs with Intel VTune profiling support to profile JavaScript
 gotoexit
 
+:run-python
+call tools\msvs\find_python.cmd
+iferrorlevel1echo Could not find python2 &goto :exit
+setcmd1=%VCBUILD_PYTHON_LOCATION%%*
+echo%cmd1%
+%cmd1%
+exit /b %ERRORLEVEL%
+
 :exit
 goto :EOF
 
@@ -513,8 +519,9 @@ rem ***************
 setNODE_VERSION=
 setTAG=
 setFULLVERSION=
-
-for /F "usebackq tokens=*"%%iin (`python "%~dp0tools\getnodeversion.py"`) dosetNODE_VERSION=%%i
+:: Call as subroutine for validation of python
+call :run-python tools\getnodeversion.py >nul
+for /F "tokens=*"%%iin ('%VCBUILD_PYTHON_LOCATION% tools\getnodeversion.py') dosetNODE_VERSION=%%i
 ifnotdefined NODE_VERSION (
 echo Cannot determine current version of Node.js
 exit /b 1
@@ -523,7 +530,7 @@ if not defined NODE_VERSION (
 ifnotdefined DISTTYPE setDISTTYPE=release
 if"%DISTTYPE%"=="release" (
 setFULLVERSION=%NODE_VERSION%
-gotoexit
+exit /b 0
 )
 if"%DISTTYPE%"=="custom" (
 ifnotdefined CUSTOMTAG (
@@ -550,7 +557,4 @@ if not "%DISTTYPE%"=="custom" (
 setTAG=%DISTTYPE%%DATESTRING%%COMMIT%
 )
 setFULLVERSION=%NODE_VERSION%-%TAG%
-
-:exit
-ifnotdefined DISTTYPEDIR setDISTTYPEDIR=%DISTTYPE%
-goto :EOF
+exit /b 0