paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-04 08:19:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

IDE: setup dialog: search fpc.exe in %SYSTEMDRIVE/pp/*, %SYSTEMDRIVE%/fpc/* and %PROGRAMFILES%/fpc/*

Browse Source 
git-svn-id: trunk@29972 -
This commit is contained in:
mattias 2011-03-21 15:01:53 +00:00
parent 992990cee7
commit ab208034fa
1 changed files with 57 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
ide/initialsetupdlgs.pas
View File

@ -402,6 +402,8 @@ function SearchCompilerCandidates(StopIfFits: boolean;
const LazarusDir, TestSrcFilename: string): TObjectList;
var
Macros: TSetupMacros;
Target: String;
ShortCompFile: String;
function CheckFile(AFilename: string; var List: TObjectList): boolean;
var
@ -446,10 +448,41 @@ var
Result:=(Item.Quality=sddqCompatible) and StopIfFits;
end;
function CheckSubDirs(ADir: string; var List: TObjectList): boolean;
// search for ADir\bin\i386-win32\fpc.exe
// and for ADir\*\bin\i386-win32\fpc.exe
var
FileInfo: TSearchRec;
SubFile: String;
begin
Result:=true;
ADir:=AppendPathDelim(TrimFilename(ExpandFileNameUTF8(TrimFilename(ADir))));
SubFile:='bin'+PathDelim+Target+PathDelim+ShortCompFile;
if CheckFile(ADir+SubFile,List) then
exit;
try
if FindFirstUTF8(ADir+GetAllFilesMask,faAnyFile,FileInfo)=0 then begin
repeat
// check if special file
if (FileInfo.Name='.') or (FileInfo.Name='..') or (FileInfo.Name='') then
continue;
if ((FileInfo.Attr and faDirectory)>0)
and CheckFile(ADir+FileInfo.Name+PathDelim+SubFile,List) then
exit;
until FindNextUTF8(FileInfo)<>0;
end;
finally
FindCloseUTF8(FileInfo);
end;
Result:=false;
end;
var
AFilename: String;
Files: TStringList;
i: Integer;
SysDrive: String;
ProgDir: String;
begin
Result:=nil;
@ -487,9 +520,30 @@ begin
Files.Free;
end;
// ToDo: search for different versions
// under windows: %PROGRAMFILES%\FPC\*, %SYSTEMDRIVE%\FPC\*\, C:\pp\, $(LazDir)\FPC
// containing bin\i386-win32\fpc.exe
// check paths with versions
Target:=GetCompiledTargetCPU+'-'+GetCompiledTargetOS;
ShortCompFile:=GetDefaultCompilerFilename;
// check $(LazDir)\fpc\bin\i386-win32\fpc.exe
if (LazarusDir<>'')
and CheckFile(AppendPathDelim(LazarusDir)
+SetDirSeparators('fpc/bin/'+Target+'/'+ShortCompFile),Result)
then exit;
if (GetDefaultSrcOSForTargetOS(GetCompiledTargetOS)='win') then begin
// windows has some special places
SysDrive:=GetEnvironmentVariableUTF8('SYSTEMDRIVE');
if SysDrive='' then SysDrive:='C:';
SysDrive:=AppendPathDelim(SysDrive);
// %SYSTEMDRIVE%\fpc\
if CheckSubDirs(SysDrive+'FPC',Result) then exit;
// %SYSTEMDRIVE%\pp\
if CheckSubDirs(SysDrive+'pp',Result) then exit;
// %PROGRAMFILES%\FPC\*
ProgDir:=AppendPathDelim(GetEnvironmentVariableUTF8('PROGRAMFILES'));
if (ProgDir<>'')
and CheckSubDirs(ProgDir+'FPC',Result) then exit;
end;
finally
if Macros<>nil then