Skip to content

PythonVersions.pas - improved PythonVersionFromPath with a new parameter FindLatestVersion #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

PythonVersions.pas - improved PythonVersionFromPath with a new parameter FindLatestVersion #61

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcb2c1b
PythonVersions.pas - improved PythonVersionFromPath with a new parame…
Oct 15, 2018
9d8c7fe
Merge remote-tracking branch 'upstream/master'
Oct 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 21 additions & 18 deletions PythonForDelphi/Components/Sources/Core/PythonVersions.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ TPythonVersion = record
function GetRegisteredPythonVersions : TPythonVersions;
(* Returns the highest numbered registered Python version *)
function GetLatestRegisteredPythonVersion(out PythonVersion: TPythonVersion): Boolean;
function PythonVersionFromPath(const Path: string; out PythonVersion: TPythonVersion): Boolean;
function PythonVersionFromPath(const Path: string; out PythonVersion: TPythonVersion; FindLatestVersion: Boolean = false): Boolean;
{$ENDIF}

implementation
Expand Down Expand Up @@ -416,24 +416,33 @@ function GetLatestRegisteredPythonVersion(out PythonVersion: TPythonVersion): Bo
end;
end;

function PythonVersionFromPath(const Path: string; out PythonVersion: TPythonVersion): Boolean;
function PythonVersionFromPath(const Path: string; out PythonVersion: TPythonVersion; FindLatestVersion: Boolean): Boolean;
function FindPythonDLL(APath : string): string;
Var
FindFileData: TWIN32FindData;
Handle : THandle;
DLLFileName: string;
I, LastI, IncI: integer;
begin
Result := '';
Handle := FindFirstFile(PWideChar(APath+'\python??.dll'), FindFileData);
if Handle = INVALID_HANDLE_VALUE then Exit; // not python dll
DLLFileName:= FindFileData.cFileName;
// skip if python3.dll was found
if Length(DLLFileName) <> 12 then FindNextFile(Handle, FindFileData);
if Handle = INVALID_HANDLE_VALUE then Exit;
Windows.FindClose(Handle);
DLLFileName:= FindFileData.cFileName;
if Length(DLLFileName) = 12 then
Result := DLLFileName;
if FindLatestVersion then begin
I := High(PYTHON_KNOWN_VERSIONS);
LastI := COMPILED_FOR_PYTHON_VERSION_INDEX;
IncI := -1;
end else begin
I := COMPILED_FOR_PYTHON_VERSION_INDEX;
LastI := High(PYTHON_KNOWN_VERSIONS);
IncI := +1;
end;
APath := IncludeTrailingPathDelimiter(APath);
while i<>LastI+IncI do begin
DLLFileName := PYTHON_KNOWN_VERSIONS[I].DLLName;
if FileExists(APath+DLLFileName) then begin
Result := DLLFileName;
exit;
end;
I := I+IncI;
end;
end;

Var
Expand Down Expand Up @@ -469,12 +478,6 @@ function PythonVersionFromPath(const Path: string; out PythonVersion: TPythonVer

PythonVersion.SysVersion := SysVersion;
PythonVersion.fSysArchitecture := PythonVersion.ExpectedArchitecture;

for I := High(PYTHON_KNOWN_VERSIONS) downto COMPILED_FOR_PYTHON_VERSION_INDEX do
if PYTHON_KNOWN_VERSIONS[I].RegVersion = SysVersion then begin
Result := True;
break;
end;
end;

{$ENDIF}
Expand Down