paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-30 16:10:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

codetools: find sources in fpc unit search paths

Browse Source 
git-svn-id: trunk@32240 -
This commit is contained in:
mattias 2011-09-09 19:00:32 +00:00
parent d7f55a0794
commit 73d34d3088
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/codetools/codetoolmanager.pas
View File

@ -5630,7 +5630,7 @@ begin
debugln(['TCodeToolManager.DirectoryCachePoolGetUnitFromSet outdated UnitSet="',dbgstr(UnitSet),'"']); debugln(['TCodeToolManager.DirectoryCachePoolGetUnitFromSet outdated UnitSet="',dbgstr(UnitSet),'"']);
exit; exit;
end; end;
Result:=UnitSetCache.GetUnitSrcFile(AnUnitName); Result:=UnitSetCache.GetUnitSrcFile(AnUnitName,false);
end; end;
function TCodeToolManager.DirectoryCachePoolGetCompiledUnitFromSet( function TCodeToolManager.DirectoryCachePoolGetCompiledUnitFromSet(

15
components/codetools/definetemplates.pas
View File

@ -8810,7 +8810,7 @@ begin
if ConfigCache.HasPPUs then begin if ConfigCache.HasPPUs then begin
// but there are other ppu files // but there are other ppu files
{$IFDEF ShowTriedUnits} {$IFDEF ShowTriedUnits}
debugln(['TFPCUnitSetCache.GetUnitSrcFile Unit="',AnUnitName,'" unit has no ppu file in FPC path, but there are other']); debugln(['TFPCUnitSetCache.GetUnitSrcFile Unit="',AnUnitName,'" unit has no ppu file in FPC path, but there are other ppu']);
{$ENDIF} {$ENDIF}
exit; exit;
end else begin end else begin
@ -8828,8 +8828,19 @@ begin
end; end;
if Tree<>nil then begin if Tree<>nil then begin
Result:=Tree[AnUnitName]; Result:=Tree[AnUnitName];
if Result<>'' then if (Result<>'') and (not FilenameIsAbsolute(Result)) then
Result:=FPCSourceDirectory+Result; Result:=FPCSourceDirectory+Result;
if (Result='') then begin
// maybe the source is in the fpc search path
ConfigCache:=GetConfigCache(false);
if ConfigCache<>nil then begin
Result:=ConfigCache.Units[AnUnitName];
if (CompareFileExt(Result,'ppu',false)=0) then begin
Result:='';
exit;
end;
end;
end;
{$IFDEF ShowTriedUnits} {$IFDEF ShowTriedUnits}
debugln(['TFPCUnitSetCache.GetUnitSrcFile Unit="',AnUnitName,'" Result=',Result]); debugln(['TFPCUnitSetCache.GetUnitSrcFile Unit="',AnUnitName,'" Result=',Result]);
{$ENDIF} {$ENDIF}

2
components/codetools/directorycacher.pas
View File

@ -1223,7 +1223,7 @@ begin
Result:=FindUnitSourceInCleanSearchPath(AUnitName,SrcPath,AnyCase); Result:=FindUnitSourceInCleanSearchPath(AUnitName,SrcPath,AnyCase);
end; end;
if Result='' then begin if Result='' then begin
// search in unit links // search in unit set
{$IFDEF ShowTriedUnits} {$IFDEF ShowTriedUnits}
DebugLn(['TCTDirectoryCache.FindUnitSourceInCompletePath unit ',AUnitName,' not found in SrcPath="',SrcPath,'" Directory="',Directory,'" searchin in unitset ...']); DebugLn(['TCTDirectoryCache.FindUnitSourceInCompletePath unit ',AUnitName,' not found in SrcPath="',SrcPath,'" Directory="',Directory,'" searchin in unitset ...']);
{$ENDIF} {$ENDIF}