paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-22 10:59:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: when checking if global unit has changed, skip units in packages

Browse Source 
git-svn-id: trunk@36852 -
This commit is contained in:
mattias 2012-04-17 07:24:00 +00:00
parent b703e8b2e7
commit ce9a70f3d4
1 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
packager/packagesystem.pas
View File

@ -2768,6 +2768,8 @@ var
Filename: String;
UnitToSrcTree: TStringToStringTree;
CurUnitName: String;
PkgOutDirs: TFilenameToStringTree;
i: Integer;
begin
Result:=false;
if TheOwner=nil then exit;
@ -2792,24 +2794,38 @@ begin
if CfgCache=nil then exit;
if CfgCache.Units=nil then exit;
UnitToSrcTree:=Cache.GetUnitToSourceTree(false);
Node:=CfgCache.Units.Tree.FindLowest;
while Node<>nil do begin
Item:=PStringToStringTreeItem(Node.Data);
Node:=CfgCache.Units.Tree.FindSuccessor(Node);
CurUnitName:=Item^.Name;
if not UnitToSrcTree.Contains(CurUnitName) then begin
// this unit has no source in the FPC source directory
// probably an user unit reachable through a unit path in fpc.cfg
continue;
end;
Filename:=Item^.Value;
if FileAgeCached(Filename)>StateFileAge then begin
debugln(['TLazPackageGraph.CheckCompileNeedDueToFPCUnits FPC unit "',Filename,'" is newer than state file of ',ID]);
Note+='FPC unit "'+Filename+'" is newer than state file of '+ID+':'+LineEnding
+' unit age='+FileAgeToStr(FileAgeCached(Filename))+LineEnding
+' state file age='+FileAgeToStr(StateFileAge)+LineEnding;
exit(true);
PkgOutDirs:=TFilenameToStringTree.Create(false);
try
for i:=0 to Count-1 do
PkgOutDirs[AppendPathDelim(Packages[i].CompilerOptions.GetUnitOutPath(false))]:='1';
Node:=CfgCache.Units.Tree.FindLowest;
while Node<>nil do begin
Item:=PStringToStringTreeItem(Node.Data);
Node:=CfgCache.Units.Tree.FindSuccessor(Node);
Filename:=Item^.Value;
if PkgOutDirs.Contains(ExtractFilePath(Filename)) then begin
// a package output directory is in the global search path
// => ignore
continue;
end;
CurUnitName:=Item^.Name;
if (UnitToSrcTree<>nil) and (UnitToSrcTree.Count>0)
and (not UnitToSrcTree.Contains(CurUnitName)) then begin
// this unit has no source in the FPC source directory
// probably an user unit reachable through a unit path in fpc.cfg
continue;
end;
if FileAgeCached(Filename)>StateFileAge then begin
debugln(['TLazPackageGraph.CheckCompileNeedDueToFPCUnits global unit "',Filename,'" is newer than state file of ',ID]);
Note+='Global unit "'+Filename+'" is newer than state file of '+ID+':'+LineEnding
+' Unit age='+FileAgeToStr(FileAgeCached(Filename))+LineEnding
+' State file age='+FileAgeToStr(StateFileAge)+LineEnding;
exit(true);
end;
end;
finally
PkgOutDirs.Free;
end;
end;