paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-18 17:39:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: fixed checking for package provides when adding a component to a form

Browse Source 
git-svn-id: trunk@13981 -
This commit is contained in:
mattias 2008-02-05 18:23:32 +00:00
parent 4fb9eb99e3
commit 609b0b0a2d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packager/packagesystem.pas
View File

@ -815,8 +815,10 @@ function TLazPackageGraph.FindPackageProvidingName(
function Search(ADependency: TPkgDependency; out Found: TLazPackage function Search(ADependency: TPkgDependency; out Found: TLazPackage
): boolean; ): boolean;
begin begin
Found:=nil;
while ADependency<>nil do begin while ADependency<>nil do begin
Found:=ADependency.RequiredPackage; Found:=ADependency.RequiredPackage;
//DebugLn(['Search ',Found.Name,' ',Found.ProvidesPackage(Name),' "',Found.Provides.Text,'"']);
if (Found<>nil) and (not (lpfVisited in Found.Flags)) then begin if (Found<>nil) and (not (lpfVisited in Found.Flags)) then begin
Found.Flags:=Found.Flags+[lpfVisited]; Found.Flags:=Found.Flags+[lpfVisited];
if Found.ProvidesPackage(Name) if Found.ProvidesPackage(Name)
@ -830,7 +832,7 @@ function TLazPackageGraph.FindPackageProvidingName(
begin begin
MarkAllPackagesAsNotVisited; MarkAllPackagesAsNotVisited;
Result:=nil; Search(FirstDependency,Result);
end; end;
function TLazPackageGraph.FindUnit(StartPackage: TLazPackage; function TLazPackageGraph.FindUnit(StartPackage: TLazPackage;

2
packager/pkgmanager.pas
View File

@ -3001,6 +3001,8 @@ begin
and (RequiredPackage<>UnitOwner) and (RequiredPackage<>UnitOwner)
and (FindCompatibleDependencyInList(FirstDependency,pdlRequires, and (FindCompatibleDependencyInList(FirstDependency,pdlRequires,
RequiredPackage)=nil) RequiredPackage)=nil)
and (PackageGraph.FindPackageProvidingName(FirstDependency,
RequiredPackage.Name)=nil)
then begin then begin
if List=nil then List:=TObjectArray.Create; if List=nil then List:=TObjectArray.Create;
List.AddObject(UnitOwner,RequiredPackage); List.AddObject(UnitOwner,RequiredPackage);