You've already forked gnatstudio
mirror of
https://github.com/AdaCore/gnatstudio.git
synced 2026-02-12 12:42:33 -08:00
Fix Codepeer object dir computation
Broken after the transition to GNATSAS eng/ide/gnatstudio#109
This commit is contained in:
committed by
Adrien Boulanger
parent
4b2c5b1ac6
commit
b94fe50df0
@@ -884,28 +884,33 @@ package body CodePeer.Module is
|
||||
Build (CodePeer.GPR_Name, "Output_Directory");
|
||||
|
||||
begin
|
||||
if not Is_GNATSAS
|
||||
and then Project.Has_Attribute (Output_Directory_Attribute)
|
||||
then
|
||||
declare
|
||||
Dir : constant GNATCOLL.VFS.Filesystem_String :=
|
||||
GNATCOLL.VFS.Filesystem_String
|
||||
(Project.Attribute_Value (Output_Directory_Attribute));
|
||||
if not Is_GNATSAS then
|
||||
if Project.Has_Attribute (Output_Directory_Attribute) then
|
||||
declare
|
||||
Dir : constant GNATCOLL.VFS.Filesystem_String :=
|
||||
GNATCOLL.VFS.Filesystem_String
|
||||
(Project.Attribute_Value (Output_Directory_Attribute));
|
||||
|
||||
begin
|
||||
begin
|
||||
return
|
||||
GNATCOLL.VFS.Create_From_Base
|
||||
(Dir, Project.Project_Path.Dir.Full_Name.all);
|
||||
end;
|
||||
else
|
||||
return
|
||||
GNATCOLL.VFS.Create_From_Base
|
||||
(Dir, Project.Project_Path.Dir.Full_Name.all);
|
||||
end;
|
||||
|
||||
GNATCOLL.VFS.Create_From_Dir
|
||||
(CodePeer_Object_Directory (Project),
|
||||
Name (Name'First .. Name'Last - Extension'Length)
|
||||
& ".output");
|
||||
end if;
|
||||
else
|
||||
return
|
||||
GNATCOLL.VFS.Create_From_Dir
|
||||
(GNATCOLL.VFS.Create_From_Dir
|
||||
(CodePeer_Object_Directory (Project),
|
||||
Name (Name'First .. Name'Last - Extension'Length)
|
||||
& ".inspector"),
|
||||
"output");
|
||||
(CodePeer_Object_Directory (Project),
|
||||
Name (Name'First .. Name'Last - Extension'Length)
|
||||
& ".inspector"),
|
||||
"output");
|
||||
end if;
|
||||
end Codepeer_Output_Directory;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user