mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-12 20:42:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13194 from alalek:samples_fix_python_search_win32

Browse Source
This commit is contained in:
Alexander Alekhin 2018-11-17 13:21:37 +03:00 committed by GitHub
commit cf86af96ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
samples/_winpack_run_python_sample.cmd
View File

@ -30,12 +30,13 @@ GOTO :PYTHON_NOT_FOUND
:QUERY_PYTHON :QUERY_PYTHON
SETLOCAL SETLOCAL
SET PY_VERSION=%1 SET PY_VERSION=%1
FOR /F "tokens=2*" %%A IN ('REG QUERY "HKCU\SOFTWARE\Python\PythonCore\%PY_VERSION%\InstallPath" /reg:64 /ve 2^>NUL ^| FIND "REG_SZ"') DO SET PYTHON_DIR=%%B SET PYTHON_DIR=
CALL :regquery "HKCU\SOFTWARE\Python\PythonCore\%PY_VERSION%\InstallPath" PYTHON_DIR
IF EXIST "%PYTHON_DIR%\python.exe" ( IF EXIST "%PYTHON_DIR%\python.exe" (
SET "PYTHON=%PYTHON_DIR%\python.exe" SET "PYTHON=%PYTHON_DIR%\python.exe"
GOTO :QUERY_PYTHON_FOUND GOTO :QUERY_PYTHON_FOUND
) )
FOR /F "tokens=2*" %%A IN ('REG QUERY "HKLM\SOFTWARE\Python\PythonCore\%PY_VERSION%\InstallPath" /reg:64 /ve 2^>NUL ^| FIND "REG_SZ"') DO SET PYTHON_DIR=%%B CALL :regquery "HKLM\SOFTWARE\Python\PythonCore\%PY_VERSION%\InstallPath" PYTHON_DIR
IF EXIST "%PYTHON_DIR%\python.exe" ( IF EXIST "%PYTHON_DIR%\python.exe" (
SET "PYTHON=%PYTHON_DIR%\python.exe" SET "PYTHON=%PYTHON_DIR%\python.exe"
GOTO :QUERY_PYTHON_FOUND GOTO :QUERY_PYTHON_FOUND
@ -46,7 +47,7 @@ ENDLOCAL
EXIT /B 1 EXIT /B 1
:QUERY_PYTHON_FOUND :QUERY_PYTHON_FOUND
ECHO Found Python %PY_VERSION% from Windows Registry ECHO Found Python %PY_VERSION% from Windows Registry: %PYTHON%
ENDLOCAL & SET PYTHON=%PYTHON% ENDLOCAL & SET PYTHON=%PYTHON%
EXIT /B 0 EXIT /B 0
@ -112,3 +113,12 @@ EXIT /B %result%
set _dir=%_dir:~0,-1% set _dir=%_dir:~0,-1%
endlocal & set %2=%_dir% endlocal & set %2=%_dir%
EXIT /B 0 EXIT /B 0
:regquery name resultVar
SETLOCAL
FOR /F "tokens=*" %%A IN ('REG QUERY "%1" /reg:64 /ve 2^>NUL ^| FIND "REG_SZ"') DO SET _val=%%A
IF "x%_val%x"=="xx" EXIT /B 1
SET _val=%_val:*REG_SZ=%
FOR /F "tokens=*" %%A IN ("%_val%") DO SET _val=%%A
ENDLOCAL & SET %2=%_val%
EXIT /B 0