paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-18 21:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: improved finding default locations for compiler and make

Browse Source 
git-svn-id: trunk@16698 -
This commit is contained in:
vincents 2008-09-24 09:34:07 +00:00
parent fc8281fe7f
commit 4e8be8cfab
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ide/include/win/lazbaseconf.inc
View File

@ -84,6 +84,27 @@ begin
SecondaryConfigPath := NewValue;
end;
type
TGetFileListProc = procedure (List: TStrings);
function FindExecutableInList(GetFileList: TGetFileListProc): string;
var
FileNames: TStrings;
i : integer;
begin
FileNames := TStringList.Create;
GetFileList(FileNames);
try
for i := 0 to FileNames.Count -1 do begin
Result := FileNames[i];
if FileExistsUTF8(Result) then exit;
end;
Result := '';
finally
FileNames.Free;
end;
end;
function FindDefaultCompilerPath: string;
begin
Result := SearchFileInPath(GetDefaultCompilerFilename,
@ -95,7 +116,8 @@ begin
Result := DefaultDrive + AppendPathDelim(ProgramDirectory) +
format('fpc\%s\bin\%s\%s',
[DefaultFPCVersion, DefaultFPCTarget, GetDefaultCompilerFilename]);
if not FileExistsUTF8(Result) then Result:='';
if FileExistsUTF8(Result) then exit;
Result := FindExecutableInList(@GetDefaultCompilerFilenames);
end;
function FindDefaultMakePath: string;
@ -105,6 +127,8 @@ begin
[AppendPathDelim(ProgramDirectory), DefaultFPCVersion, DefaultFPCTarget]),
GetEnvironmentVariableUTF8('PATH'),';',
[]);
if Result <> '' then exit;
Result := FindExecutableInList(@GetDefaultMakeFilenames)
end;
function GetDefaultCompiledUnitExt(FPCVersion, FPCRelease: integer): string;
@ -131,7 +155,7 @@ end;
procedure GetDefaultCompilerFilenames(List: TStrings);
begin
List.Add(DefaultDrive + format('fpc\%s\bin\%s\%s',
List.Add(DefaultDrive + format('\fpc\%s\bin\%s\%s',
[DefaultFPCVersion, DefaultFPCTarget, GetDefaultCompilerFilename]));
List.Add(AppendPathDelim(ProgramDirectory) + format('fpc\%s\bin\%s\%s',
[DefaultFPCVersion, DefaultFPCTarget, GetDefaultCompilerFilename]));
@ -139,7 +163,7 @@ end;
procedure GetDefaultMakeFilenames(List: TStrings);
begin
List.Add(DefaultDrive + format('fpc\%s\bin\%s\make.exe',
List.Add(DefaultDrive + format('\fpc\%s\bin\%s\make.exe',
[DefaultFPCVersion, DefaultFPCTarget]));
List.Add(AppendPathDelim(ProgramDirectory) +
format('fpc\%s\bin\%s\make.exe',[DefaultFPCVersion, DefaultFPCTarget]));
@ -166,7 +190,7 @@ end;
procedure InternalInit;
begin
DefaultDrive := ExtractFileDrive(ProgramDirectory);
DefaultFPCTarget:= {$I %FPCTARGET%};
DefaultFPCTarget:= GetDefaultTargetCPU + '-' + GetDefaultTargetOS;
DefaultFPCVersion:= {$I %FPCVERSION%};
{$ifndef ver2_2_0}
// the last part of the path returned by GetAppConfigDir is the application