package body Prj.Env is
+ Buffer_Initial : constant := 1_000;
+ -- Initial size of Buffer
+
-----------------------
-- Local Subprograms --
-----------------------
+ package Source_Path_Table is new GNAT.Dynamic_Tables
+ (Table_Component_Type => Name_Id,
+ Table_Index_Type => Natural,
+ Table_Low_Bound => 1,
+ Table_Initial => 50,
+ Table_Increment => 100);
+ -- A table to store the source dirs before creating the source path file
+
+ package Object_Path_Table is new GNAT.Dynamic_Tables
+ (Table_Component_Type => Path_Name_Type,
+ Table_Index_Type => Natural,
+ Table_Low_Bound => 1,
+ Table_Initial => 50,
+ Table_Increment => 100);
+ -- A table to store the object dirs, before creating the object path file
+
+ procedure Add_To_Buffer
+ (S : String;
+ Buffer : in out String_Access;
+ Buffer_Last : in out Natural);
+ -- Add a string to Buffer, extending Buffer if needed
+
procedure Add_To_Path
(Source_Dirs : String_List_Id;
- In_Tree : Project_Tree_Ref);
+ In_Tree : Project_Tree_Ref;
+ Buffer : in out String_Access;
+ Buffer_Last : in out Natural);
-- Add to Ada_Path_Buffer all the source directories in string list
- -- Source_Dirs, if any. Increment Ada_Path_Length.
+ -- Source_Dirs, if any.
- procedure Add_To_Path (Dir : String; In_Tree : Project_Tree_Ref);
+ procedure Add_To_Path
+ (Dir : String;
+ Buffer : in out String_Access;
+ Buffer_Last : in out Natural);
-- If Dir is not already in the global variable Ada_Path_Buffer, add it.
- -- Increment Ada_Path_Length.
- -- If Ada_Path_Length /= 0, prepend a Path_Separator character to
- -- Path.
+ -- If Buffer_Last /= 0, prepend a Path_Separator character to Path.
procedure Add_To_Source_Path
- (Source_Dirs : String_List_Id; In_Tree : Project_Tree_Ref);
+ (Source_Dirs : String_List_Id;
+ In_Tree : Project_Tree_Ref;
+ Source_Paths : in out Source_Path_Table.Instance);
-- Add to Ada_Path_B all the source directories in string list
-- Source_Dirs, if any. Increment Ada_Path_Length.
procedure Add_To_Object_Path
- (Object_Dir : Path_Name_Type;
- In_Tree : Project_Tree_Ref);
+ (Object_Dir : Path_Name_Type;
+ Object_Paths : in out Object_Path_Table.Instance);
-- Add Object_Dir to object path table. Make sure it is not duplicate
-- and it is the last one in the current table.
----------------------
function Ada_Include_Path
- (Project : Project_Id;
- In_Tree : Project_Tree_Ref) return String_Access
+ (Project : Project_Id;
+ In_Tree : Project_Tree_Ref;
+ Recursive : Boolean := False) return String
is
+ Buffer : String_Access;
+ Buffer_Last : Natural := 0;
+
procedure Add (Project : Project_Id; Dummy : in out Boolean);
-- Add source dirs of Project to the path
procedure Add (Project : Project_Id; Dummy : in out Boolean) is
pragma Unreferenced (Dummy);
begin
- Add_To_Path (Project.Source_Dirs, In_Tree);
+ Add_To_Path (Project.Source_Dirs, In_Tree, Buffer, Buffer_Last);
end Add;
procedure For_All_Projects is
new For_Every_Project_Imported (Boolean, Add);
+
Dummy : Boolean := False;
-- Start of processing for Ada_Include_Path
begin
- -- If it is the first time we call this function for
- -- this project, compute the source path
-
- if Project.Ada_Include_Path = null then
- In_Tree.Private_Part.Ada_Path_Length := 0;
- For_All_Projects (Project, Dummy);
+ if Recursive then
- Project.Ada_Include_Path :=
- new String'
- (In_Tree.Private_Part.Ada_Path_Buffer
- (1 .. In_Tree.Private_Part.Ada_Path_Length));
- end if;
+ -- If it is the first time we call this function for
+ -- this project, compute the source path
- return Project.Ada_Include_Path;
- end Ada_Include_Path;
+ if Project.Ada_Include_Path = null then
+ Buffer := new String (1 .. 4096);
+ For_All_Projects (Project, Dummy);
+ Project.Ada_Include_Path := new String'(Buffer (1 .. Buffer_Last));
+ Free (Buffer);
+ end if;
- ----------------------
- -- Ada_Include_Path --
- ----------------------
+ return Project.Ada_Include_Path.all;
- function Ada_Include_Path
- (Project : Project_Id;
- In_Tree : Project_Tree_Ref;
- Recursive : Boolean) return String
- is
- begin
- if Recursive then
- return Ada_Include_Path (Project, In_Tree).all;
else
- In_Tree.Private_Part.Ada_Path_Length := 0;
- Add_To_Path (Project.Source_Dirs, In_Tree);
- return
- In_Tree.Private_Part.Ada_Path_Buffer
- (1 .. In_Tree.Private_Part.Ada_Path_Length);
+ Buffer := new String (1 .. 4096);
+ Add_To_Path (Project.Source_Dirs, In_Tree, Buffer, Buffer_Last);
+
+ declare
+ Result : constant String := Buffer (1 .. Buffer_Last);
+ begin
+ Free (Buffer);
+ return Result;
+ end;
end if;
end Ada_Include_Path;
function Ada_Objects_Path
(Project : Project_Id;
- In_Tree : Project_Tree_Ref;
Including_Libraries : Boolean := True) return String_Access
is
+ Buffer : String_Access;
+ Buffer_Last : Natural := 0;
+
procedure Add (Project : Project_Id; Dummy : in out Boolean);
-- Add all the object directories of a project to the path
Only_If_Ada => False);
begin
if Path /= No_Path then
- Add_To_Path (Get_Name_String (Path), In_Tree);
+ Add_To_Path (Get_Name_String (Path), Buffer, Buffer_Last);
end if;
end Add;
procedure For_All_Projects is
new For_Every_Project_Imported (Boolean, Add);
+
Dummy : Boolean := False;
-- Start of processing for Ada_Objects_Path
-- this project, compute the objects path
if Project.Ada_Objects_Path = null then
- In_Tree.Private_Part.Ada_Path_Length := 0;
+ Buffer := new String (1 .. 4096);
For_All_Projects (Project, Dummy);
- Project.Ada_Objects_Path :=
- new String'
- (In_Tree.Private_Part.Ada_Path_Buffer
- (1 .. In_Tree.Private_Part.Ada_Path_Length));
+ Project.Ada_Objects_Path := new String'(Buffer (1 .. Buffer_Last));
+ Free (Buffer);
end if;
return Project.Ada_Objects_Path;
end Ada_Objects_Path;
+ -------------------
+ -- Add_To_Buffer --
+ -------------------
+
+ procedure Add_To_Buffer
+ (S : String;
+ Buffer : in out String_Access;
+ Buffer_Last : in out Natural)
+ is
+ Last : constant Natural := Buffer_Last + S'Length;
+
+ begin
+ while Last > Buffer'Last loop
+ declare
+ New_Buffer : constant String_Access :=
+ new String (1 .. 2 * Buffer'Last);
+ begin
+ New_Buffer (1 .. Buffer_Last) := Buffer (1 .. Buffer_Last);
+ Free (Buffer);
+ Buffer := New_Buffer;
+ end;
+ end loop;
+
+ Buffer (Buffer_Last + 1 .. Last) := S;
+ Buffer_Last := Last;
+ end Add_To_Buffer;
+
------------------------
-- Add_To_Object_Path --
------------------------
procedure Add_To_Object_Path
- (Object_Dir : Path_Name_Type; In_Tree : Project_Tree_Ref)
+ (Object_Dir : Path_Name_Type;
+ Object_Paths : in out Object_Path_Table.Instance)
is
begin
-- Check if the directory is already in the table
for Index in Object_Path_Table.First ..
- Object_Path_Table.Last (In_Tree.Private_Part.Object_Paths)
+ Object_Path_Table.Last (Object_Paths)
loop
-- If it is, remove it, and add it as the last one
- if In_Tree.Private_Part.Object_Paths.Table (Index) = Object_Dir then
+ if Object_Paths.Table (Index) = Object_Dir then
for Index2 in Index + 1 ..
- Object_Path_Table.Last
- (In_Tree.Private_Part.Object_Paths)
+ Object_Path_Table.Last (Object_Paths)
loop
- In_Tree.Private_Part.Object_Paths.Table (Index2 - 1) :=
- In_Tree.Private_Part.Object_Paths.Table (Index2);
+ Object_Paths.Table (Index2 - 1) := Object_Paths.Table (Index2);
end loop;
- In_Tree.Private_Part.Object_Paths.Table
- (Object_Path_Table.Last (In_Tree.Private_Part.Object_Paths)) :=
- Object_Dir;
+ Object_Paths.Table
+ (Object_Path_Table.Last (Object_Paths)) := Object_Dir;
return;
end if;
end loop;
-- The directory is not already in the table, add it
- Object_Path_Table.Increment_Last (In_Tree.Private_Part.Object_Paths);
- In_Tree.Private_Part.Object_Paths.Table
- (Object_Path_Table.Last (In_Tree.Private_Part.Object_Paths)) :=
- Object_Dir;
+ Object_Path_Table.Append (Object_Paths, Object_Dir);
end Add_To_Object_Path;
-----------------
procedure Add_To_Path
(Source_Dirs : String_List_Id;
- In_Tree : Project_Tree_Ref)
+ In_Tree : Project_Tree_Ref;
+ Buffer : in out String_Access;
+ Buffer_Last : in out Natural)
is
Current : String_List_Id := Source_Dirs;
Source_Dir : String_Element;
begin
while Current /= Nil_String loop
Source_Dir := In_Tree.String_Elements.Table (Current);
- Add_To_Path (Get_Name_String (Source_Dir.Display_Value), In_Tree);
+ Add_To_Path (Get_Name_String (Source_Dir.Display_Value),
+ Buffer, Buffer_Last);
Current := Source_Dir.Next;
end loop;
end Add_To_Path;
- procedure Add_To_Path (Dir : String; In_Tree : Project_Tree_Ref) is
+ procedure Add_To_Path
+ (Dir : String;
+ Buffer : in out String_Access;
+ Buffer_Last : in out Natural)
+ is
Len : Natural;
New_Buffer : String_Access;
Min_Len : Natural;
-- Start of processing for Add_To_Path
begin
- if Is_Present (In_Tree.Private_Part.Ada_Path_Buffer
- (1 .. In_Tree.Private_Part.Ada_Path_Length),
- Dir)
- then
+ if Is_Present (Buffer (1 .. Buffer_Last), Dir) then
-- Dir is already in the path, nothing to do
return;
end if;
- Min_Len := In_Tree.Private_Part.Ada_Path_Length + Dir'Length;
+ Min_Len := Buffer_Last + Dir'Length;
- if In_Tree.Private_Part.Ada_Path_Length > 0 then
+ if Buffer_Last > 0 then
-- Add 1 for the Path_Separator character
-- If Ada_Path_Buffer is too small, increase it
- Len := In_Tree.Private_Part.Ada_Path_Buffer'Last;
+ Len := Buffer'Last;
if Len < Min_Len then
loop
end loop;
New_Buffer := new String (1 .. Len);
- New_Buffer (1 .. In_Tree.Private_Part.Ada_Path_Length) :=
- In_Tree.Private_Part.Ada_Path_Buffer
- (1 .. In_Tree.Private_Part.Ada_Path_Length);
- Free (In_Tree.Private_Part.Ada_Path_Buffer);
- In_Tree.Private_Part.Ada_Path_Buffer := New_Buffer;
+ New_Buffer (1 .. Buffer_Last) := Buffer (1 .. Buffer_Last);
+ Free (Buffer);
+ Buffer := New_Buffer;
end if;
- if In_Tree.Private_Part.Ada_Path_Length > 0 then
- In_Tree.Private_Part.Ada_Path_Length :=
- In_Tree.Private_Part.Ada_Path_Length + 1;
- In_Tree.Private_Part.Ada_Path_Buffer
- (In_Tree.Private_Part.Ada_Path_Length) := Path_Separator;
+ if Buffer_Last > 0 then
+ Buffer_Last := Buffer_Last + 1;
+ Buffer (Buffer_Last) := Path_Separator;
end if;
- In_Tree.Private_Part.Ada_Path_Buffer
- (In_Tree.Private_Part.Ada_Path_Length + 1 ..
- In_Tree.Private_Part.Ada_Path_Length + Dir'Length) := Dir;
- In_Tree.Private_Part.Ada_Path_Length :=
- In_Tree.Private_Part.Ada_Path_Length + Dir'Length;
+ Buffer (Buffer_Last + 1 .. Buffer_Last + Dir'Length) := Dir;
+ Buffer_Last := Buffer_Last + Dir'Length;
end Add_To_Path;
------------------------
------------------------
procedure Add_To_Source_Path
- (Source_Dirs : String_List_Id; In_Tree : Project_Tree_Ref)
+ (Source_Dirs : String_List_Id;
+ In_Tree : Project_Tree_Ref;
+ Source_Paths : in out Source_Path_Table.Instance)
is
Current : String_List_Id := Source_Dirs;
Source_Dir : String_Element;
-- Check if the source directory is already in the table
for Index in Source_Path_Table.First ..
- Source_Path_Table.Last
- (In_Tree.Private_Part.Source_Paths)
+ Source_Path_Table.Last (Source_Paths)
loop
-- If it is already, no need to add it
- if In_Tree.Private_Part.Source_Paths.Table (Index) =
- Source_Dir.Value
- then
+ if Source_Paths.Table (Index) = Source_Dir.Value then
Add_It := False;
exit;
end if;
end loop;
if Add_It then
- Source_Path_Table.Increment_Last
- (In_Tree.Private_Part.Source_Paths);
- In_Tree.Private_Part.Source_Paths.Table
- (Source_Path_Table.Last (In_Tree.Private_Part.Source_Paths)) :=
- Source_Dir.Value;
+ Source_Path_Table.Append (Source_Paths, Source_Dir.Display_Value);
end if;
-- Next source directory
Namings : Naming_Table.Instance;
-- Table storing the naming data for gnatmake/gprmake
+ Buffer : String_Access := new String (1 .. Buffer_Initial);
+ Buffer_Last : Natural := 0;
+
File_Name : Path_Name_Type := No_Path;
File : File_Descriptor := Invalid_FD;
- Current_Unit : Unit_Index := Units_Htable.Get_First (In_Tree.Units_HT);
-
Current_Naming : Naming_Id;
-
- Status : Boolean;
- -- For call to Close
+ Iter : Source_Iterator;
+ Source : Source_Id;
procedure Check (Project : Project_Id; State : in out Integer);
-- Recursive procedure that put in the config pragmas file any non
-- standard naming schemes, if it is not already in the file, then call
-- itself for any imported project.
- procedure Check_Temp_File;
- -- Check that a temporary file has been opened.
- -- If not, create one, and put its name in the project data,
- -- with the indication that it is a temporary file.
-
- procedure Put
- (Unit_Name : Name_Id;
- File_Name : File_Name_Type;
- Unit_Kind : Spec_Or_Body;
- Index : Int);
+ procedure Put (Source : Source_Id);
-- Put an SFN pragma in the temporary file
- procedure Put (File : File_Descriptor; S : String);
- procedure Put_Line (File : File_Descriptor; S : String);
- -- Output procedures, analogous to normal Text_IO procs of same name
+ procedure Put (S : String);
+ procedure Put_Line (S : String);
+ -- Output procedures, analogous to normal Text_IO procs of same name.
+ -- The text is put in Buffer, then it will be writen into a temporary
+ -- file with procedure Write_Temp_File below.
+
+ procedure Write_Temp_File;
+ -- Create a temporary file and put the content of the buffer in it
-----------
-- Check --
if Lang = null then
if Current_Verbosity = High then
- Write_Str ("Languages does not contain Ada, nothing to do");
+ Write_Line (" Languages does not contain Ada, nothing to do");
end if;
return;
Naming_Table.Increment_Last (Namings);
Namings.Table (Naming_Table.Last (Namings)) := Naming;
- -- We need a temporary file to be created
-
- Check_Temp_File;
-
-- Put the SFN pragmas for the naming scheme
-- Spec
Put_Line
- (File, "pragma Source_File_Name_Project");
+ ("pragma Source_File_Name_Project");
Put_Line
- (File, " (Spec_File_Name => ""*" &
+ (" (Spec_File_Name => ""*" &
Get_Name_String (Naming.Spec_Suffix) & """,");
Put_Line
- (File, " Casing => " &
+ (" Casing => " &
Image (Naming.Casing) & ",");
Put_Line
- (File, " Dot_Replacement => """ &
+ (" Dot_Replacement => """ &
Get_Name_String (Naming.Dot_Replacement) & """);");
-- and body
Put_Line
- (File, "pragma Source_File_Name_Project");
+ ("pragma Source_File_Name_Project");
Put_Line
- (File, " (Body_File_Name => ""*" &
+ (" (Body_File_Name => ""*" &
Get_Name_String (Naming.Body_Suffix) & """,");
Put_Line
- (File, " Casing => " &
+ (" Casing => " &
Image (Naming.Casing) & ",");
Put_Line
- (File, " Dot_Replacement => """ &
+ (" Dot_Replacement => """ &
Get_Name_String (Naming.Dot_Replacement) &
""");");
-- and maybe separate
if Naming.Body_Suffix /= Naming.Separate_Suffix then
- Put_Line (File, "pragma Source_File_Name_Project");
+ Put_Line ("pragma Source_File_Name_Project");
Put_Line
- (File, " (Subunit_File_Name => ""*" &
+ (" (Subunit_File_Name => ""*" &
Get_Name_String (Naming.Separate_Suffix) & """,");
Put_Line
- (File, " Casing => " &
+ (" Casing => " &
Image (Naming.Casing) & ",");
Put_Line
- (File, " Dot_Replacement => """ &
+ (" Dot_Replacement => """ &
Get_Name_String (Naming.Dot_Replacement) &
""");");
end if;
end if;
end Check;
- ---------------------
- -- Check_Temp_File --
- ---------------------
-
- procedure Check_Temp_File is
- begin
- if File = Invalid_FD then
- Tempdir.Create_Temp_File (File, Name => File_Name);
-
- if File = Invalid_FD then
- Prj.Com.Fail
- ("unable to create temporary configuration pragmas file");
-
- else
- Record_Temp_File (File_Name);
-
- if Opt.Verbose_Mode then
- Write_Str ("Creating temp file """);
- Write_Str (Get_Name_String (File_Name));
- Write_Line ("""");
- end if;
- end if;
- end if;
- end Check_Temp_File;
-
---------
-- Put --
---------
- procedure Put
- (Unit_Name : Name_Id;
- File_Name : File_Name_Type;
- Unit_Kind : Spec_Or_Body;
- Index : Int)
- is
+ procedure Put (Source : Source_Id) is
begin
- -- A temporary file needs to be open
-
- Check_Temp_File;
-
-- Put the pragma SFN for the unit kind (spec or body)
- Put (File, "pragma Source_File_Name_Project (");
- Put (File, Namet.Get_Name_String (Unit_Name));
+ Put ("pragma Source_File_Name_Project (");
+ Put (Namet.Get_Name_String (Source.Unit.Name));
- if Unit_Kind = Spec then
- Put (File, ", Spec_File_Name => """);
+ if Source.Kind = Spec then
+ Put (", Spec_File_Name => """);
else
- Put (File, ", Body_File_Name => """);
+ Put (", Body_File_Name => """);
end if;
- Put (File, Namet.Get_Name_String (File_Name));
- Put (File, """");
+ Put (Namet.Get_Name_String (Source.File));
+ Put ("""");
- if Index /= 0 then
- Put (File, ", Index =>");
- Put (File, Index'Img);
+ if Source.Index /= 0 then
+ Put (", Index =>");
+ Put (Source.Index'Img);
end if;
- Put_Line (File, ");");
+ Put_Line (");");
end Put;
- procedure Put (File : File_Descriptor; S : String) is
- Last : Natural;
-
+ procedure Put (S : String) is
begin
- Last := Write (File, S (S'First)'Address, S'Length);
-
- if Last /= S'Length then
- Prj.Com.Fail
- ("Disk full when creating " & Get_Name_String (File_Name));
- end if;
+ Add_To_Buffer (S, Buffer, Buffer_Last);
if Current_Verbosity = High then
Write_Str (S);
-- Put_Line --
--------------
- procedure Put_Line (File : File_Descriptor; S : String) is
- S0 : String (1 .. S'Length + 1);
- Last : Natural;
-
+ procedure Put_Line (S : String) is
begin
-- Add an ASCII.LF to the string. As this config file is supposed to
-- be used only by the compiler, we don't care about the characters
-- it is more convenient to be able to read gnat.adc during
-- development, for which the ASCII.LF is fine.
- S0 (1 .. S'Length) := S;
- S0 (S0'Last) := ASCII.LF;
- Last := Write (File, S0'Address, S0'Length);
+ Put (S);
+ Put (S => (1 => ASCII.LF));
+ end Put_Line;
- if Last /= S'Length + 1 then
- Prj.Com.Fail
- ("Disk full when creating " & Get_Name_String (File_Name));
+ ---------------------
+ -- Write_Temp_File --
+ ---------------------
+
+ procedure Write_Temp_File is
+ Status : Boolean := False;
+ Last : Natural;
+
+ begin
+ Tempdir.Create_Temp_File (File, File_Name);
+
+ if File /= Invalid_FD then
+ Last := Write (File, Buffer (1)'Address, Buffer_Last);
+
+ if Last = Buffer_Last then
+ Close (File, Status);
+ end if;
end if;
- if Current_Verbosity = High then
- Write_Line (S);
+ if not Status then
+ Prj.Com.Fail ("unable to create temporary file");
end if;
- end Put_Line;
+ end Write_Temp_File;
+
+ procedure Check_Imported_Projects is
+ new For_Every_Project_Imported (Integer, Check);
- procedure Check_Imported_Projects is new For_Every_Project_Imported
- (Integer, Check);
Dummy : Integer := 0;
-- Start of processing for Create_Config_Pragmas_File
begin
if not For_Project.Config_Checked then
-
Naming_Table.Init (Namings);
-- Check the naming schemes
Check_Imported_Projects (For_Project, Dummy, Imported_First => False);
- -- Visit all the units and process those that need an SFN pragma
+ -- Visit all the files and process those that need an SFN pragma
- while Current_Unit /= No_Unit_Index loop
- if Current_Unit.File_Names (Spec) /= null
- and then Current_Unit.File_Names (Spec).Naming_Exception
- and then not Current_Unit.File_Names (Spec).Locally_Removed
- then
- Put (Current_Unit.Name,
- Current_Unit.File_Names (Spec).File,
- Spec,
- Current_Unit.File_Names (Spec).Index);
- end if;
+ Iter := For_Each_Source (In_Tree, For_Project);
+ while Element (Iter) /= No_Source loop
+ Source := Element (Iter);
- if Current_Unit.File_Names (Impl) /= null
- and then Current_Unit.File_Names (Impl).Naming_Exception
- and then not Current_Unit.File_Names (Impl).Locally_Removed
+ if Source.Index >= 1
+ and then not Source.Locally_Removed
+ and then Source.Unit /= null
then
- Put (Current_Unit.Name,
- Current_Unit.File_Names (Impl).File,
- Impl,
- Current_Unit.File_Names (Impl).Index);
+ Put (Source);
end if;
- Current_Unit := Units_Htable.Get_Next (In_Tree.Units_HT);
+ Next (Iter);
end loop;
-- If there are no non standard naming scheme, issue the GNAT
-- standard naming scheme. This will tell the compiler that
-- a project file is used and will forbid any pragma SFN.
- if File = Invalid_FD then
- Check_Temp_File;
+ if Buffer_Last = 0 then
- Put_Line (File, "pragma Source_File_Name_Project");
- Put_Line (File, " (Spec_File_Name => ""*.ads"",");
- Put_Line (File, " Dot_Replacement => ""-"",");
- Put_Line (File, " Casing => lowercase);");
+ Put_Line ("pragma Source_File_Name_Project");
+ Put_Line (" (Spec_File_Name => ""*.ads"",");
+ Put_Line (" Dot_Replacement => ""-"",");
+ Put_Line (" Casing => lowercase);");
- Put_Line (File, "pragma Source_File_Name_Project");
- Put_Line (File, " (Body_File_Name => ""*.adb"",");
- Put_Line (File, " Dot_Replacement => ""-"",");
- Put_Line (File, " Casing => lowercase);");
+ Put_Line ("pragma Source_File_Name_Project");
+ Put_Line (" (Body_File_Name => ""*.adb"",");
+ Put_Line (" Dot_Replacement => ""-"",");
+ Put_Line (" Casing => lowercase);");
end if;
-- Close the temporary file
- GNAT.OS_Lib.Close (File, Status);
-
- if not Status then
- Prj.Com.Fail
- ("Disk full when creating " & Get_Name_String (File_Name));
- end if;
+ Write_Temp_File;
if Opt.Verbose_Mode then
- Write_Str ("Closing configuration file """);
+ Write_Str ("Created configuration file """);
Write_Str (Get_Name_String (File_Name));
Write_Line ("""");
end if;
For_Project.Config_File_Temp := True;
For_Project.Config_Checked := True;
end if;
+
+ Free (Buffer);
end Create_Config_Pragmas_File;
--------------------
Name : out Path_Name_Type)
is
File : File_Descriptor := Invalid_FD;
- Status : Boolean;
+
+ Buffer : String_Access := new String (1 .. Buffer_Initial);
+ Buffer_Last : Natural := 0;
procedure Put_Name_Buffer;
- -- Put the line contained in the Name_Buffer in the mapping file
+ -- Put the line contained in the Name_Buffer in the global buffer
procedure Process (Project : Project_Id; State : in out Integer);
-- Generate the mapping file for Project (not recursively)
- ---------
- -- Put --
- ---------
+ ---------------------
+ -- Put_Name_Buffer --
+ ---------------------
procedure Put_Name_Buffer is
- Last : Natural;
-
begin
Name_Len := Name_Len + 1;
Name_Buffer (Name_Len) := ASCII.LF;
- Last := Write (File, Name_Buffer (1)'Address, Name_Len);
if Current_Verbosity = High then
Write_Str ("Mapping file: " & Name_Buffer (1 .. Name_Len));
end if;
- if Last /= Name_Len then
- Prj.Com.Fail ("Disk full, cannot write mapping file");
- end if;
+ Add_To_Buffer (Name_Buffer (1 .. Name_Len), Buffer, Buffer_Last);
end Put_Name_Buffer;
-------------
if Source.Unit /= No_Unit_Index then
Get_Name_String (Source.Unit.Name);
- if Get_Mode = Ada_Only then
+ if Source.Language.Config.Kind = Unit_Based then
-- ??? Mapping_Spec_Suffix could be set in the case of
-- gnatmake as well
-- Start of processing for Create_Mapping_File
begin
+ For_Every_Imported_Project (Project, Dummy);
- -- Create the temporary file
+ declare
+ Last : Natural;
+ Status : Boolean := False;
- Tempdir.Create_Temp_File (File, Name => Name);
+ begin
+ Create_Temp_File (In_Tree, File, Name, "mapping");
- if File = Invalid_FD then
- Prj.Com.Fail ("unable to create temporary mapping file");
+ if File /= Invalid_FD then
+ Last := Write (File, Buffer (1)'Address, Buffer_Last);
- else
- Record_Temp_File (Name);
-
- if Opt.Verbose_Mode then
- Write_Str ("Creating temp mapping file """);
- Write_Str (Get_Name_String (Name));
- Write_Line ("""");
+ if Last = Buffer_Last then
+ GNAT.OS_Lib.Close (File, Status);
+ end if;
end if;
- end if;
- For_Every_Imported_Project (Project, Dummy);
- GNAT.OS_Lib.Close (File, Status);
-
- if not Status then
-
- -- We were able to create the temporary file, so there is no problem
- -- of protection. However, we are not able to close it, so there must
- -- be a capacity problem that we express using "disk full".
+ if not Status then
+ Prj.Com.Fail ("could not write mapping file");
+ end if;
+ end;
- Prj.Com.Fail ("disk full, could not write mapping file");
- end if;
+ Free (Buffer);
end Create_Mapping_File;
- --------------------------
- -- Create_New_Path_File --
- --------------------------
+ ----------------------
+ -- Create_Temp_File --
+ ----------------------
- procedure Create_New_Path_File
+ procedure Create_Temp_File
(In_Tree : Project_Tree_Ref;
Path_FD : out File_Descriptor;
- Path_Name : out Path_Name_Type)
+ Path_Name : out Path_Name_Type;
+ File_Use : String)
is
begin
Tempdir.Create_Temp_File (Path_FD, Path_Name);
if Path_Name /= No_Path then
- Record_Temp_File (Path_Name);
+ if Current_Verbosity = High then
+ Write_Line ("Create temp file (" & File_Use & ") "
+ & Get_Name_String (Path_Name));
+ end if;
- -- Record the name, so that the temp path file will be deleted at the
- -- end of the program.
+ Record_Temp_File (In_Tree, Path_Name);
- Path_File_Table.Increment_Last (In_Tree.Private_Part.Path_Files);
- In_Tree.Private_Part.Path_Files.Table
- (Path_File_Table.Last (In_Tree.Private_Part.Path_Files)) :=
- Path_Name;
+ else
+ Prj.Com.Fail
+ ("unable to create temporary " & File_Use & " file");
end if;
- end Create_New_Path_File;
-
- ---------------------------
- -- Delete_All_Path_Files --
- ---------------------------
+ end Create_Temp_File;
- procedure Delete_All_Path_Files (In_Tree : Project_Tree_Ref) is
- Disregard : Boolean := True;
- pragma Unreferenced (Disregard);
+ --------------------------
+ -- Create_New_Path_File --
+ --------------------------
+ procedure Create_New_Path_File
+ (In_Tree : Project_Tree_Ref;
+ Path_FD : out File_Descriptor;
+ Path_Name : out Path_Name_Type)
+ is
begin
- for Index in Path_File_Table.First ..
- Path_File_Table.Last (In_Tree.Private_Part.Path_Files)
- loop
- if In_Tree.Private_Part.Path_Files.Table (Index) /= No_Path then
- Delete_File
- (Get_Name_String
- (In_Tree.Private_Part.Path_Files.Table (Index)),
- Disregard);
- end if;
- end loop;
-
- -- If any of the environment variables ADA_PRJ_INCLUDE_FILE or
- -- ADA_PRJ_OBJECTS_FILE has been set, then reset their value to
- -- the empty string. On VMS, this has the effect of deassigning
- -- the logical names.
-
- if In_Tree.Private_Part.Ada_Prj_Include_File_Set then
- Setenv (Project_Include_Path_File, "");
- In_Tree.Private_Part.Ada_Prj_Include_File_Set := False;
- end if;
-
- if In_Tree.Private_Part.Ada_Prj_Objects_File_Set then
- Setenv (Project_Objects_Path_File, "");
- In_Tree.Private_Part.Ada_Prj_Objects_File_Set := False;
- end if;
- end Delete_All_Path_Files;
+ Create_Temp_File (In_Tree, Path_FD, Path_Name, "path file");
+ end Create_New_Path_File;
------------------------------------
-- File_Name_Of_Library_Unit_Body --
procedure Initialize (In_Tree : Project_Tree_Ref) is
begin
- In_Tree.Private_Part.Fill_Mapping_File := True;
In_Tree.Private_Part.Current_Source_Path_File := No_Path;
In_Tree.Private_Part.Current_Object_Path_File := No_Path;
end Initialize;
Including_Libraries : Boolean)
is
+ Source_Paths : Source_Path_Table.Instance;
+ Object_Paths : Object_Path_Table.Instance;
+ -- List of source or object dirs. Only computed the first time this
+ -- procedure is called (since Source_FD is then reused)
+
Source_FD : File_Descriptor := Invalid_FD;
Object_FD : File_Descriptor := Invalid_FD;
+ -- The temporary files to store the paths. These are only created the
+ -- first time this procedure is called, and reused from then on.
Process_Source_Dirs : Boolean := False;
Process_Object_Dirs : Boolean := False;
Status : Boolean;
-- For calls to Close
- Len : Natural;
+ Last : Natural;
+ Buffer : String_Access := new String (1 .. Buffer_Initial);
+ Buffer_Last : Natural := 0;
procedure Recursive_Add (Project : Project_Id; Dummy : in out Boolean);
-- Recursive procedure to add the source/object paths of extended/
-- Ada sources.
if Has_Ada_Sources (Project) then
- Add_To_Source_Path (Project.Source_Dirs, In_Tree);
+ Add_To_Source_Path (Project.Source_Dirs, In_Tree, Source_Paths);
end if;
end if;
Only_If_Ada => True);
if Path /= No_Path then
- Add_To_Object_Path (Path, In_Tree);
+ Add_To_Object_Path (Path, Object_Paths);
end if;
end if;
end Recursive_Add;
procedure For_All_Projects is
new For_Every_Project_Imported (Boolean, Recursive_Add);
+
Dummy : Boolean := False;
-- Start of processing for Set_Ada_Paths
-- compute the source path and/or the object path.
if Project.Include_Path_File = No_Path then
+ Source_Path_Table.Init (Source_Paths);
Process_Source_Dirs := True;
Create_New_Path_File
(In_Tree, Source_FD, Project.Include_Path_File);
if Including_Libraries then
if Project.Objects_Path_File_With_Libs = No_Path then
+ Object_Path_Table.Init (Object_Paths);
Process_Object_Dirs := True;
Create_New_Path_File
(In_Tree, Object_FD, Project.Objects_Path_File_With_Libs);
else
if Project.Objects_Path_File_Without_Libs = No_Path then
+ Object_Path_Table.Init (Object_Paths);
Process_Object_Dirs := True;
Create_New_Path_File
(In_Tree, Object_FD, Project.Objects_Path_File_Without_Libs);
-- then call the recursive procedure Add for Project.
if Process_Source_Dirs or Process_Object_Dirs then
- Source_Path_Table.Set_Last (In_Tree.Private_Part.Source_Paths, 0);
- Object_Path_Table.Set_Last (In_Tree.Private_Part.Object_Paths, 0);
For_All_Projects (Project, Dummy);
end if;
- -- Write and close any file that has been created
+ -- Write and close any file that has been created. Source_FD is not set
+ -- when this subprogram is called a second time or more, since we reuse
+ -- the previous version of the file.
if Source_FD /= Invalid_FD then
+ Buffer_Last := 0;
+
for Index in Source_Path_Table.First ..
- Source_Path_Table.Last
- (In_Tree.Private_Part.Source_Paths)
+ Source_Path_Table.Last (Source_Paths)
loop
- Get_Name_String (In_Tree.Private_Part.Source_Paths.Table (Index));
+ Get_Name_String (Source_Paths.Table (Index));
Name_Len := Name_Len + 1;
Name_Buffer (Name_Len) := ASCII.LF;
- Len := Write (Source_FD, Name_Buffer (1)'Address, Name_Len);
-
- if Len /= Name_Len then
- Prj.Com.Fail ("disk full");
- end if;
+ Add_To_Buffer (Name_Buffer (1 .. Name_Len), Buffer, Buffer_Last);
end loop;
- Close (Source_FD, Status);
+ Last := Write (Source_FD, Buffer (1)'Address, Buffer_Last);
+
+ if Last = Buffer_Last then
+ Close (Source_FD, Status);
+
+ else
+ Status := False;
+ end if;
if not Status then
- Prj.Com.Fail ("disk full");
+ Prj.Com.Fail ("could not write temporary file");
end if;
end if;
if Object_FD /= Invalid_FD then
+ Buffer_Last := 0;
+
for Index in Object_Path_Table.First ..
- Object_Path_Table.Last
- (In_Tree.Private_Part.Object_Paths)
+ Object_Path_Table.Last (Object_Paths)
loop
- Get_Name_String (In_Tree.Private_Part.Object_Paths.Table (Index));
+ Get_Name_String (Object_Paths.Table (Index));
Name_Len := Name_Len + 1;
Name_Buffer (Name_Len) := ASCII.LF;
- Len := Write (Object_FD, Name_Buffer (1)'Address, Name_Len);
-
- if Len /= Name_Len then
- Prj.Com.Fail ("disk full");
- end if;
+ Add_To_Buffer (Name_Buffer (1 .. Name_Len), Buffer, Buffer_Last);
end loop;
- Close (Object_FD, Status);
+ Last := Write (Object_FD, Buffer (1)'Address, Buffer_Last);
+
+ if Last = Buffer_Last then
+ Close (Object_FD, Status);
+ else
+ Status := False;
+ end if;
if not Status then
- Prj.Com.Fail ("disk full");
+ Prj.Com.Fail ("could not write temporary file");
end if;
end if;
Set_Path_File_Var
(Project_Include_Path_File,
Get_Name_String (In_Tree.Private_Part.Current_Source_Path_File));
- In_Tree.Private_Part.Ada_Prj_Include_File_Set := True;
end if;
if Including_Libraries then
(Project_Objects_Path_File,
Get_Name_String
(In_Tree.Private_Part.Current_Object_Path_File));
- In_Tree.Private_Part.Ada_Prj_Objects_File_Set := True;
end if;
else
(Project_Objects_Path_File,
Get_Name_String
(In_Tree.Private_Part.Current_Object_Path_File));
- In_Tree.Private_Part.Ada_Prj_Objects_File_Set := True;
end if;
end if;
- end Set_Ada_Paths;
-
- ---------------------------------------------
- -- Set_Mapping_File_Initial_State_To_Empty --
- ---------------------------------------------
- procedure Set_Mapping_File_Initial_State_To_Empty
- (In_Tree : Project_Tree_Ref)
- is
- begin
- In_Tree.Private_Part.Fill_Mapping_File := False;
- end Set_Mapping_File_Initial_State_To_Empty;
+ Free (Buffer);
+ end Set_Ada_Paths;
-----------------------
-- Set_Path_File_Var --
OSDN Git Service
