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

project groups: load target when adding

Browse Source 
git-svn-id: trunk@50390 -
This commit is contained in:
mattias 2015-11-18 13:27:28 +00:00
parent 2e542bed45
commit 4894afcb9a
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/projectgroups/projectgroup.pp
View File

@ -830,9 +830,9 @@ var
Pkg: TIDEPackage;
PkgName: String;
begin
debugln(['TIDECompileTarget.LoadPackage ',Filename]);
if FFiles<>nil then exit; // already loaded
debugln(['TIDECompileTarget.LoadPackage ',Filename]);
FFiles:=TStringList.Create;
FRequiredPackages:=TObjectList.Create(True);
@ -879,9 +879,9 @@ var
PkgName, Path, SubPath, CurFilename: String;
xml: TXMLConfig;
begin
debugln(['TIDECompileTarget.LoadProject ',Filename]);
if FFiles<>nil then exit; // already loaded
debugln(['TIDECompileTarget.LoadProject ',Filename]);
FFiles:=TStringList.Create;
FRequiredPackages:=TObjectList.Create(True);
@ -949,8 +949,9 @@ var
PG: TIDEProjectGroup;
Flags: TProjectGroupLoadOptions;
begin
debugln(['TIDECompileTarget.LoadProjectGroup ',Filename]);
if ProjectGroup<>nil then exit;
debugln(['TIDECompileTarget.LoadProjectGroup ',Filename]);
PG:=TIDEProjectGroup.Create(Self);
FProjectGroup:=PG;
PG.FileName:=Self.FileName;

11
components/projectgroups/projectgroupeditor.pas
View File

@ -525,12 +525,6 @@ begin
ntDependencies: ;
ntDependency: ;
end;
{if (ND<>nil) and (ND.NodeType<>ntTarget) then
begin
ND.ProjectGroup.ActivateTarget(ND.Target);
if (ND.ProjectGroup<>FProjectGroup) then // No callback, fake it.
OnTargetActivated(ND.ProjectGroup,ND.Target);
end;}
end;
procedure TProjectGroupEditorForm.OnTargetAdded(Sender: TObject;
@ -538,7 +532,7 @@ procedure TProjectGroupEditorForm.OnTargetAdded(Sender: TObject;
Var
N: TTreeNode;
begin
// ToDo: use of FTargetNodes is wrong if PG<>FProjectGroup
(Target as TIDECompileTarget).LoadTarget(true);
N:=CreateTargetNode(FTargetNodes[False],ntTarget,Target);
FillTargetNode(N,Target);
TVPG.Selected:=N;
@ -552,7 +546,6 @@ Var
begin
N:=FindNodeFromTarget(Target);
TVPG.Items.Delete(N);
// ToDo: The use of FTargetNodes is not correct when PG<>FProjectGroup
CreateTargetNode(FTargetNodes[True],ntRemovedTarget,Target);
TVPG.Selected:=FProjectGroupTVNode;
UpdateStatusBarTargetCount;
@ -1094,7 +1087,7 @@ begin
Pkg:=PackageEditingInterface.FindPackageWithName(PkgName);
if Pkg<>nil then
PkgName:=Pkg.Name;
CreateSubNode(PD[False],ntDependency,T,Pkg.Name);
CreateSubNode(PD[False],ntDependency,T,PkgName);
end;
end;