Commit 289176c9 by Pascal Obry Committed by Arnaud Charlet

prj-nmsc.adb: Keep Object and Exec directory casing.

2008-07-31  Pascal Obry  <obry@adacore.com>

	* prj-nmsc.adb: Keep Object and Exec directory casing.

From-SVN: r138417
parent d7831fdb
...@@ -6105,7 +6105,7 @@ package body Prj.Nmsc is ...@@ -6105,7 +6105,7 @@ package body Prj.Nmsc is
-- We set the object directory to its default -- We set the object directory to its default
Data.Object_Directory := Data.Directory; Data.Object_Directory := Data.Directory;
if Object_Dir.Value /= Empty_String then if Object_Dir.Value /= Empty_String then
Get_Name_String (Object_Dir.Value); Get_Name_String (Object_Dir.Value);
...@@ -6170,7 +6170,7 @@ package body Prj.Nmsc is ...@@ -6170,7 +6170,7 @@ package body Prj.Nmsc is
(Project, (Project,
In_Tree, In_Tree,
Name_Find, Name_Find,
Data.Directory.Name, Data.Directory.Display_Name,
Data.Object_Directory.Name, Data.Object_Directory.Name,
Data.Object_Directory.Display_Name, Data.Object_Directory.Display_Name,
Create => "object", Create => "object",
...@@ -6213,7 +6213,7 @@ package body Prj.Nmsc is ...@@ -6213,7 +6213,7 @@ package body Prj.Nmsc is
(Project, (Project,
In_Tree, In_Tree,
File_Name_Type (Exec_Dir.Value), File_Name_Type (Exec_Dir.Value),
Data.Directory.Name, Data.Directory.Display_Name,
Data.Exec_Directory.Name, Data.Exec_Directory.Name,
Data.Exec_Directory.Display_Name, Data.Exec_Directory.Display_Name,
Create => "exec", Create => "exec",
...@@ -6311,7 +6311,7 @@ package body Prj.Nmsc is ...@@ -6311,7 +6311,7 @@ package body Prj.Nmsc is
Data.Object_Directory := No_Path_Information; Data.Object_Directory := No_Path_Information;
end if; end if;
Data.Source_Dirs := Nil_String; Data.Source_Dirs := Nil_String;
else else
declare declare
...@@ -6323,8 +6323,7 @@ package body Prj.Nmsc is ...@@ -6323,8 +6323,7 @@ package body Prj.Nmsc is
Source_Dir := Source_Dirs.Values; Source_Dir := Source_Dirs.Values;
while Source_Dir /= Nil_String loop while Source_Dir /= Nil_String loop
Element := Element := In_Tree.String_Elements.Table (Source_Dir);
In_Tree.String_Elements.Table (Source_Dir);
Find_Source_Dirs Find_Source_Dirs
(File_Name_Type (Element.Value), Element.Location); (File_Name_Type (Element.Value), Element.Location);
Source_Dir := Element.Next; Source_Dir := Element.Next;
...@@ -6344,8 +6343,7 @@ package body Prj.Nmsc is ...@@ -6344,8 +6343,7 @@ package body Prj.Nmsc is
Source_Dir := Excluded_Source_Dirs.Values; Source_Dir := Excluded_Source_Dirs.Values;
while Source_Dir /= Nil_String loop while Source_Dir /= Nil_String loop
Element := Element := In_Tree.String_Elements.Table (Source_Dir);
In_Tree.String_Elements.Table (Source_Dir);
Find_Source_Dirs Find_Source_Dirs
(File_Name_Type (Element.Value), (File_Name_Type (Element.Value),
Element.Location, Element.Location,
...@@ -6449,6 +6447,7 @@ package body Prj.Nmsc is ...@@ -6449,6 +6447,7 @@ package body Prj.Nmsc is
if not Prj.Util.Is_Valid (File) then if not Prj.Util.Is_Valid (File) then
Error_Msg (Project, In_Tree, "file does not exist", Location); Error_Msg (Project, In_Tree, "file does not exist", Location);
else else
-- Read the lines one by one -- Read the lines one by one
...@@ -6554,9 +6553,9 @@ package body Prj.Nmsc is ...@@ -6554,9 +6553,9 @@ package body Prj.Nmsc is
Last : Natural := File'Last; Last : Natural := File'Last;
Standard_GNAT : Boolean; Standard_GNAT : Boolean;
Spec : constant File_Name_Type := Spec : constant File_Name_Type :=
Spec_Suffix_Id_Of (In_Tree, Name_Ada, Naming); Spec_Suffix_Id_Of (In_Tree, Name_Ada, Naming);
Body_Suff : constant File_Name_Type := Body_Suff : constant File_Name_Type :=
Body_Suffix_Id_Of (In_Tree, Name_Ada, Naming); Body_Suffix_Id_Of (In_Tree, Name_Ada, Naming);
begin begin
Standard_GNAT := Spec = Default_Ada_Spec_Suffix Standard_GNAT := Spec = Default_Ada_Spec_Suffix
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment