Skip to content

R
riscv-gcc-1
Commit 3d164ffc by Arnaud Charlet
Options

[multiple changes] 

2010-06-18  Pascal Obry  <obry@adacore.com>

	* prj-nmsc.adb: Fix source filenames casing in debug output.

2010-06-18  Robert Dewar  <dewar@adacore.com>

	* gnatcmd.adb: Minor reformatting.

From-SVN: r160989
parent 4d777a71
Showing with 28 additions and 21 deletions
gcc/ada/ChangeLog
2010-06-18 Pascal Obry <obry@adacore.com>
* prj-nmsc.adb: Fix source filenames casing in debug output.
2010-06-18 Robert Dewar <dewar@adacore.com>
* gnatcmd.adb: Minor reformatting.
2010-06-18 Robert Dewar <dewar@adacore.com> 2010-06-18 Robert Dewar <dewar@adacore.com>
* sem_eval.adb (Eval_Conditional_Expression): Result is static if * sem_eval.adb (Eval_Conditional_Expression): Result is static if
......
gcc/ada/prj-nmsc.adb
...@@ -6888,31 +6888,29 @@ package body Prj.Nmsc is ...@@ -6888,31 +6888,29 @@ package body Prj.Nmsc is
end if; end if;
declare declare
Path_Name : constant String := Path_Name : constant String :=
Normalize_Pathname Normalize_Pathname
(Name (1 .. Last), (Name (1 .. Last),
Directory => Directory =>
Source_Directory Source_Directory
(Source_Directory'First .. (Source_Directory'First ..
Dir_Last), Dir_Last),
Resolve_Links => Resolve_Links =>
Opt.Follow_Links_For_Files, Opt.Follow_Links_For_Files,
Case_Sensitive => True); Case_Sensitive => True);
Path : Path_Name_Type; Path : Path_Name_Type;
Display_Path : Path_Name_Type; FF : File_Found :=
FF : File_Found := Excluded_Sources_Htable.Get
Excluded_Sources_Htable.Get (Project.Excluded, File_Name);
(Project.Excluded, File_Name); To_Remove : Boolean := False;
To_Remove : Boolean := False;
begin begin
Name_Len := Path_Name'Length; Name_Len := Path_Name'Length;
Name_Buffer (1 .. Name_Len) := Path_Name; Name_Buffer (1 .. Name_Len) := Path_Name;
Display_Path := Name_Find;
if Osint.File_Names_Case_Sensitive then if Osint.File_Names_Case_Sensitive then
Path := Display_Path; Path := Name_Find;
else else
Canonical_Case_File_Name Canonical_Case_File_Name
(Name_Buffer (1 .. Name_Len)); (Name_Buffer (1 .. Name_Len));
...@@ -6927,7 +6925,8 @@ package body Prj.Nmsc is ...@@ -6927,7 +6925,8 @@ package body Prj.Nmsc is
if Current_Verbosity = High then if Current_Verbosity = High then
Write_Str (" excluded source """); Write_Str (" excluded source """);
Write_Str (Get_Name_String (File_Name)); Write_Str
(Get_Name_String (Display_File_Name));
Write_Line (""""); Write_Line ("""");
end if; end if;
...@@ -6954,7 +6953,7 @@ package body Prj.Nmsc is ...@@ -6954,7 +6953,7 @@ package body Prj.Nmsc is
Source_Dir_Rank => Num_Nod.Number, Source_Dir_Rank => Num_Nod.Number,
Data => Data, Data => Data,
Path => Path, Path => Path,
Display_Path => Display_Path, Display_Path => Name_Find,
File_Name => File_Name, File_Name => File_Name,
Locally_Removed => To_Remove, Locally_Removed => To_Remove,
Display_File_Name => Display_File_Name, Display_File_Name => Display_File_Name,
......
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