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

project groups: editor: load added target

Browse Source 
git-svn-id: trunk@50363 -
This commit is contained in:
mattias 2015-11-17 14:01:55 +00:00
parent 19c203dd22
commit 888c155576
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/projectgroups/projectgroup.pp
View File

@ -211,7 +211,6 @@ end;
procedure TIDEProjectGroupManager.DoNewClick(Sender: TObject); procedure TIDEProjectGroupManager.DoNewClick(Sender: TObject);
var var
AProject: TLazProject; AProject: TLazProject;
T: TIDECompileTarget;
begin begin
if Not CheckSaved then if Not CheckSaved then
Exit; Exit;
@ -222,8 +221,7 @@ begin
AProject:=LazarusIDE.ActiveProject; AProject:=LazarusIDE.ActiveProject;
if (AProject<>nil) and FilenameIsAbsolute(AProject.ProjectInfoFile) if (AProject<>nil) and FilenameIsAbsolute(AProject.ProjectInfoFile)
and FileExistsCached(AProject.ProjectInfoFile) then begin and FileExistsCached(AProject.ProjectInfoFile) then begin
T:=FProjectGroup.AddTarget(AProject.ProjectInfoFile) as TIDECompileTarget; FProjectGroup.AddTarget(AProject.ProjectInfoFile);
if T<>nil then T.LoadTarget;
end; end;
ShowProjectGroupEditor; ShowProjectGroupEditor;
@ -653,8 +651,8 @@ begin
if ProjFile.IsPartOfProject then if ProjFile.IsPartOfProject then
FFiles.Add(ProjFile.Filename); FFiles.Add(ProjFile.Filename);
end; end;
// ToDo: dependencies
// load dependencies from active project
PkgList:=nil; PkgList:=nil;
try try
PackageEditingInterface.GetRequiredPackages(AProject,PkgList,[pirCompileOrder]); PackageEditingInterface.GetRequiredPackages(AProject,PkgList,[pirCompileOrder]);
@ -671,6 +669,8 @@ begin
end; end;
end else begin end else begin
// load from .lpi file // load from .lpi file
LazarusIDE.ActiveProject;
// ToDo // ToDo
end; end;
end; end;

1
components/projectgroups/projectgroupeditor.pas
View File

@ -495,6 +495,7 @@ Var
N: TTreeNode; N: TTreeNode;
begin begin
PG:=Sender as TProjectGroup; PG:=Sender as TProjectGroup;
(Target as TIDECompileTarget).LoadTarget;
// ToDo: use of FTargetNodes is wrong if PG<>FProjectGroup // ToDo: use of FTargetNodes is wrong if PG<>FProjectGroup
N:=CreateNode(FTargetNodes[False],DisplayFileName(PG,ntTarget,Target.Filename),ntTarget,Target,PG); N:=CreateNode(FTargetNodes[False],DisplayFileName(PG,ntTarget,Target.Filename),ntTarget,Target,PG);
FillTargetNode(N,PG,Target); FillTargetNode(N,PG,Target);