-- --
-- B o d y --
-- --
--- Copyright (C) 2001-2006, AdaCore --
+-- Copyright (C) 2001-2008, AdaCore --
-- --
-- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- --
--- ware Foundation; either version 2, or (at your option) any later ver- --
+-- ware Foundation; either version 3, or (at your option) any later ver- --
-- sion. GNAT is distributed in the hope that it will be useful, but WITH- --
-- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY --
-- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --
-- for more details. You should have received a copy of the GNU General --
--- Public License distributed with GNAT; see file COPYING. If not, write --
--- to the Free Software Foundation, 51 Franklin Street, Fifth Floor, --
--- Boston, MA 02110-1301, USA. --
+-- Public License distributed with GNAT; see file COPYING3. If not, go to --
+-- http://www.gnu.org/licenses for a complete copy of the license. --
-- --
-- GNAT was originally developed by the GNAT team at New York University. --
-- Extensive contributions were provided by Ada Core Technologies Inc. --
with MLib.Fil; use MLib.Fil;
with MLib.Tgt; use MLib.Tgt;
with MLib.Utl; use MLib.Utl;
-with Namet; use Namet;
with Opt;
with Output; use Output;
with Prj.Com; use Prj.Com;
with Switch; use Switch;
with Table;
with Targparm; use Targparm;
+with Tempdir;
+with Types; use Types;
with Ada.Characters.Handling;
B_Start : String_Ptr := new String'("b~");
-- Prefix of bind file, changed to b__ for VMS
- S_Osinte_Ads : Name_Id := No_Name;
+ S_Osinte_Ads : File_Name_Type := No_File;
-- Name_Id for "s-osinte.ads"
- S_Dec_Ads : Name_Id := No_Name;
+ S_Dec_Ads : File_Name_Type := No_File;
-- Name_Id for "dec.ads"
- G_Trasym_Ads : Name_Id := No_Name;
+ G_Trasym_Ads : File_Name_Type := No_File;
-- Name_Id for "g-trasym.ads"
- No_Argument_List : aliased String_List := (1 .. 0 => null);
- No_Argument : constant String_List_Access := No_Argument_List'Access;
-
Arguments : String_List_Access := No_Argument;
-- Used to accumulate arguments for the invocation of gnatbind and of
-- the compiler. Also used to collect the interface ALI when copying
Hash => Hash,
Equal => "=");
- -- List of non-Ada object files
-
- Foreign_Objects : Argument_List_Access;
-
- package Foreigns is new Table.Table
- (Table_Name => "Mlib.Prj.Foreigns",
- Table_Component_Type => String_Access,
- Table_Index_Type => Natural,
- Table_Low_Bound => 1,
- Table_Initial => 20,
- Table_Increment => 100);
-
-- List of ALI files
Ali_Files : Argument_List_Access;
(Header_Num => Header_Num,
Element => Boolean,
No_Element => False,
- Key => Name_Id,
+ Key => File_Name_Type,
Hash => Hash,
Equal => "=");
(Header_Num => Header_Num,
Element => Boolean,
No_Element => False,
- Key => Name_Id,
+ Key => File_Name_Type,
Hash => Hash,
Equal => "=");
(Header_Num => Header_Num,
Element => Boolean,
No_Element => False,
- Key => Name_Id,
+ Key => File_Name_Type,
Hash => Hash,
Equal => "=");
(For_Project : Project_Id;
In_Tree : Project_Tree_Ref;
Interfaces : Argument_List;
- To_Dir : Name_Id);
+ To_Dir : Path_Name_Type);
-- Copy the interface sources of a SAL to directory To_Dir
procedure Display (Executable : String);
procedure Reset_Tables;
-- Make sure that all the above tables are empty
- -- (Objects, Foreign_Objects, Ali_Files, Options).
+ -- (Objects, Ali_Files, Options).
function SALs_Use_Constructors return Boolean;
-- Indicate if Stand-Alone Libraries are automatically initialized using
Bind : Boolean := True;
Link : Boolean := True)
is
+ Maximum_Size : Integer;
+ pragma Import (C, Maximum_Size, "__gnat_link_max");
+ -- Maximum number of bytes to put in an invocation of the
+ -- gnatbind.
+
+ Size : Integer;
+ -- The number of bytes for the invocation of the gnatbind
+
Warning_For_Library : Boolean := False;
-- Set to True for the first warning about a unit missing from the
-- interface set.
- Libgnarl_Needed : Boolean := False;
+ Data : Project_Data := In_Tree.Projects.Table (For_Project);
+
+ Libgnarl_Needed : Yes_No_Unknown := Data.Libgnarl_Needed;
-- Set to True if library needs to be linked with libgnarl
Libdecgnat_Needed : Boolean := False;
-- On OpenVMS, set to True if library needs to be linked with
-- g-trasym.obj.
- Data : Project_Data := In_Tree.Projects.Table (For_Project);
-
Object_Directory_Path : constant String :=
- Get_Name_String (Data.Object_Directory);
+ Get_Name_String (Data.Display_Object_Dir);
Standalone : constant Boolean := Data.Standalone_Library;
Success : Boolean := False;
Library_Options : Variable_Value := Nil_Variable_Value;
-
Library_GCC : Variable_Value := Nil_Variable_Value;
Driver_Name : Name_Id := No_Name;
In_Main_Object_Directory : Boolean := True;
+ There_Are_Foreign_Sources : Boolean;
+
Rpath : String_Access := null;
-- Allocated only if Path Option is supported
-- If null, Path Option is not supported.
-- Not a constant so that it can be deallocated.
- First_ALI : Name_Id := No_Name;
+ First_ALI : File_Name_Type := No_File;
-- Store the ALI file name of a source of the library (the first found)
- procedure Add_ALI_For (Source : Name_Id);
+ procedure Add_ALI_For (Source : File_Name_Type);
-- Add the name of the ALI file corresponding to Source to the
-- Arguments.
function Check_Project (P : Project_Id) return Boolean;
-- Returns True if P is For_Project or a project extended by For_Project
- procedure Check_Libs (ALI_File : String);
+ procedure Check_Libs (ALI_File : String; Main_Project : Boolean);
-- Set Libgnarl_Needed if the ALI_File indicates that there is a need
-- to link with -lgnarl (this is the case when there is a dependency
-- on s-osinte.ads). On OpenVMS, set Libdecgnat_Needed if the ALI file
-- Add_ALI_For --
-----------------
- procedure Add_ALI_For (Source : Name_Id) is
+ procedure Add_ALI_For (Source : File_Name_Type) is
ALI : constant String := ALI_File_Name (Get_Name_String (Source));
- ALI_Id : Name_Id;
+ ALI_Id : File_Name_Type;
begin
if Bind then
-- Set First_ALI, if not already done
- if First_ALI = No_Name then
+ if First_ALI = No_File then
First_ALI := ALI_Id;
end if;
end Add_ALI_For;
-- Start of processing for Add_Rpath
begin
- -- If firt path, allocate initial Rpath
+ -- If first path, allocate initial Rpath
if Rpath = null then
Rpath := new String (1 .. Initial_Rpath_Length);
-- Check_Libs --
----------------
- procedure Check_Libs (ALI_File : String) is
- Lib_File : Name_Id;
+ procedure Check_Libs (ALI_File : String; Main_Project : Boolean) is
+ Lib_File : File_Name_Type;
Text : Text_Buffer_Ptr;
Id : ALI.ALI_Id;
begin
- if not Libgnarl_Needed or
- (OpenVMS_On_Target and then
- ((not Libdecgnat_Needed) or
- (not Gtrasymobj_Needed)))
+ if Libgnarl_Needed /= Yes
+ or else
+ (Main_Project
+ and then OpenVMS_On_Target
+ and then ((not Libdecgnat_Needed) or (not Gtrasymobj_Needed)))
then
-- Scan the ALI file
ALI.ALIs.Table (Id).Last_Sdep
loop
if ALI.Sdep.Table (Index).Sfile = S_Osinte_Ads then
- Libgnarl_Needed := True;
+ Libgnarl_Needed := Yes;
+
+ if Main_Project then
+ In_Tree.Projects.Table (For_Project).Libgnarl_Needed :=
+ Yes;
+ else
+ exit;
+ end if;
elsif OpenVMS_On_Target then
if ALI.Sdep.Table (Index).Sfile = S_Dec_Ads then
for W in Unit_Data.First_With .. Unit_Data.Last_With loop
Afile := Withs.Table (W).Afile;
- if Afile /= No_Name and then Library_ALIs.Get (Afile)
+ if Afile /= No_File and then Library_ALIs.Get (Afile)
and then not Processed_ALIs.Get (Afile)
then
if not Interface_ALIs.Get (Afile) then
---------------------
procedure Process_Project (Project : Project_Id) is
- Data : constant Project_Data :=
- In_Tree.Projects.Table (Project);
+ Data : Project_Data := In_Tree.Projects.Table (Project);
Imported : Project_List := Data.Imported_Projects;
Element : Project_Element;
if Project /= For_Project and then Data.Library then
Library_Projs.Increment_Last;
Library_Projs.Table (Library_Projs.Last) := Project;
+
+ -- Check if because of this library we need to use libgnarl
+
+ if Libgnarl_Needed = Unknown then
+ if Data.Libgnarl_Needed = Unknown
+ and then Data.Object_Directory /= No_Path
+ then
+ -- Check if libgnarl is needed for this library
+
+ declare
+ Object_Dir_Path : constant String :=
+ Get_Name_String
+ (Data.Display_Object_Dir);
+ Object_Dir : Dir_Type;
+ Filename : String (1 .. 255);
+ Last : Natural;
+
+ begin
+ Open (Object_Dir, Object_Dir_Path);
+
+ -- For all entries in the object directory
+
+ loop
+ Read (Object_Dir, Filename, Last);
+ exit when Last = 0;
+
+ -- Check if it is an object file
+
+ if Is_Obj (Filename (1 .. Last)) then
+ declare
+ Object_Path : constant String :=
+ Normalize_Pathname
+ (Object_Dir_Path &
+ Directory_Separator &
+ Filename (1 .. Last));
+ ALI_File : constant String :=
+ Ext_To
+ (Object_Path, "ali");
+
+ begin
+ if Is_Regular_File (ALI_File) then
+
+ -- Find out if for this ALI file,
+ -- libgnarl is necessary.
+
+ Check_Libs
+ (ALI_File, Main_Project => False);
+
+ if Libgnarl_Needed = Yes then
+ Data.Libgnarl_Needed := Yes;
+ In_Tree.Projects.Table
+ (For_Project).Libgnarl_Needed :=
+ Yes;
+ exit;
+ end if;
+ end if;
+ end;
+ end if;
+ end loop;
+
+ Close (Object_Dir);
+ end;
+ end if;
+
+ if Data.Libgnarl_Needed = Yes then
+ Libgnarl_Needed := Yes;
+ In_Tree.Projects.Table (For_Project).Libgnarl_Needed :=
+ Yes;
+ end if;
+ end if;
end if;
end if;
Process_Project (For_Project);
-- Add the -L and -l switches and, if the Rpath option is supported,
- -- add the directory to the Rpath.
- -- As the library projects are in the wrong order, process from the
- -- last to the first.
+ -- add the directory to the Rpath. As the library projects are in the
+ -- wrong order, process from the last to the first.
for Index in reverse 1 .. Library_Projs.Last loop
Current := Library_Projs.Table (Index);
Get_Name_String
- (In_Tree.Projects.Table (Current).Library_Dir);
+ (In_Tree.Projects.Table (Current).Display_Library_Dir);
Opts.Increment_Last;
Opts.Table (Opts.Last) :=
new String'("-L" & Name_Buffer (1 .. Name_Len));
Com.Fail ("project """, Project_Name, """ has no library");
end if;
+ -- Do not attempt to build the library if it is externally built
+
+ if Data.Externally_Built then
+ return;
+ end if;
+
-- If this is the first time Build_Library is called, get the Name_Id
-- of "s-osinte.ads".
- if S_Osinte_Ads = No_Name then
+ if S_Osinte_Ads = No_File then
Name_Len := 0;
Add_Str_To_Name_Buffer ("s-osinte.ads");
S_Osinte_Ads := Name_Find;
end if;
- if S_Dec_Ads = No_Name then
+ if S_Dec_Ads = No_File then
Name_Len := 0;
Add_Str_To_Name_Buffer ("dec.ads");
S_Dec_Ads := Name_Find;
end if;
- if G_Trasym_Ads = No_Name then
+ if G_Trasym_Ads = No_File then
Name_Len := 0;
Add_Str_To_Name_Buffer ("g-trasym.ads");
G_Trasym_Ads := Name_Find;
Change_Dir (Object_Directory_Path);
if Standalone then
+
-- Call gnatbind only if Bind is True
if Bind then
loop
Unit := In_Tree.Units.Table (Source);
- if Unit.File_Names (Body_Part).Name /= No_Name
+ if Unit.File_Names (Body_Part).Name /= No_File
and then Unit.File_Names (Body_Part).Path /= Slash
then
if
Check_Project (Unit.File_Names (Body_Part).Project)
then
- if Unit.File_Names (Specification).Name = No_Name then
+ if Unit.File_Names (Specification).Name = No_File then
declare
Src_Ind : Source_File_Index;
-- Add the ALI file only if it is not a subunit
- if
- not Sinput.P.Source_File_Is_Subunit (Src_Ind)
+ if not
+ Sinput.P.Source_File_Is_Subunit (Src_Ind)
then
Add_ALI_For
(Unit.File_Names (Body_Part).Name);
end if;
end if;
- elsif Unit.File_Names (Specification).Name /= No_Name
+ elsif Unit.File_Names (Specification).Name /= No_File
and then Unit.File_Names (Specification).Path /= Slash
and then Check_Project
(Unit.File_Names (Specification).Project)
-- Get an eventual --RTS from the ALI file
- if First_ALI /= No_Name then
+ if First_ALI /= No_File then
declare
T : Text_Buffer_Ptr;
A : ALI_Id;
Display (Gnatbind);
- -- Invoke gnatbind
+ Size := 0;
+ for J in 1 .. Argument_Number loop
+ Size := Size + Arguments (J)'Length + 1;
+ end loop;
+
+ -- Invoke gnatbind with the arguments if the size is not too large
+
+ if Size <= Maximum_Size then
+ Spawn
+ (Gnatbind_Path.all,
+ Arguments (1 .. Argument_Number),
+ Success);
+
+ else
+ -- Otherwise create a temporary response file
+
+ declare
+ FD : File_Descriptor;
+ Path : Path_Name_Type;
+ Args : Argument_List (1 .. 1);
+ EOL : constant String (1 .. 1) := (1 => ASCII.LF);
+ Status : Integer;
+ Succ : Boolean;
+ Quotes_Needed : Boolean;
+ Last_Char : Natural;
+ Ch : Character;
+
+ begin
+ Tempdir.Create_Temp_File (FD, Path);
+ Args (1) := new String'("@" & Get_Name_String (Path));
+
+ for J in 1 .. Argument_Number loop
- GNAT.OS_Lib.Spawn
- (Gnatbind_Path.all, Arguments (1 .. Argument_Number), Success);
+ -- Check if the argument should be quoted
+
+ Quotes_Needed := False;
+ Last_Char := Arguments (J)'Length;
+
+ for K in Arguments (J)'Range loop
+ Ch := Arguments (J) (K);
+
+ if Ch = ' ' or else Ch = ASCII.HT or else Ch = '"' then
+ Quotes_Needed := True;
+ exit;
+ end if;
+ end loop;
+
+ if Quotes_Needed then
+
+ -- Quote the argument, doubling '"'
+
+ declare
+ Arg : String (1 .. Arguments (J)'Length * 2 + 2);
+
+ begin
+ Arg (1) := '"';
+ Last_Char := 1;
+
+ for K in Arguments (J)'Range loop
+ Ch := Arguments (J) (K);
+ Last_Char := Last_Char + 1;
+ Arg (Last_Char) := Ch;
+
+ if Ch = '"' then
+ Last_Char := Last_Char + 1;
+ Arg (Last_Char) := '"';
+ end if;
+ end loop;
+
+ Last_Char := Last_Char + 1;
+ Arg (Last_Char) := '"';
+
+ Status := Write (FD, Arg'Address, Last_Char);
+ end;
+
+ else
+ Status := Write
+ (FD,
+ Arguments (J) (Arguments (J)'First)'Address,
+ Last_Char);
+ end if;
+
+ if Status /= Last_Char then
+ Fail ("disk full");
+ end if;
+
+ Status := Write (FD, EOL (1)'Address, 1);
+
+ if Status /= 1 then
+ Fail ("disk full");
+ end if;
+ end loop;
+
+ Close (FD);
+
+ -- And invoke gnatbind with this this response file
+
+ Spawn (Gnatbind_Path.all, Args, Success);
+
+ Delete_File (Get_Name_String (Path), Succ);
+
+ if not Succ then
+ null;
+ end if;
+ end;
+ end if;
if not Success then
Com.Fail ("could not bind standalone library ",
-- Compile the binder generated file only if Link is true
if Link then
+
-- Set the paths
Set_Ada_Paths
-- Get the back-end switches and --RTS from the ALI file
- if First_ALI /= No_Name then
+ if First_ALI /= No_File then
declare
T : Text_Buffer_Ptr;
A : ALI_Id;
-- Read it
- A := Scan_ALI
- (First_ALI, T, Ignore_ED => False, Err => False);
+ A :=
+ Scan_ALI (First_ALI, T, Ignore_ED => False, Err => False);
if A /= No_ALI_Id then
for Index in
-- generated file.
Display (Gcc);
- GNAT.OS_Lib.Spawn
+ Spawn
(Gcc_Path.all, Arguments (1 .. Argument_Number), Success);
if not Success then
-- Build the library only if Link is True
if Link then
+
-- If attribute Library_GCC was specified, get the driver name
Library_GCC :=
if not Library_Options.Default then
declare
- Current : String_List_Id := Library_Options.Values;
+ Current : String_List_Id;
Element : String_Element;
begin
+ Current := Library_Options.Values;
while Current /= Nil_String loop
- Element :=
- In_Tree.String_Elements.Table (Current);
+ Element := In_Tree.String_Elements.Table (Current);
Get_Name_String (Element.Value);
if Name_Len /= 0 then
end;
end if;
- Lib_Dirpath := new String'(Get_Name_String (Data.Library_Dir));
+ Lib_Dirpath :=
+ new String'(Get_Name_String (Data.Display_Library_Dir));
Lib_Filename := new String'(Get_Name_String (Data.Library_Name));
case Data.Library_Kind is
In_Main_Object_Directory := True;
+ There_Are_Foreign_Sources := Data.Other_Sources_Present;
+
loop
declare
Object_Dir_Path : constant String :=
- Get_Name_String (Data.Object_Directory);
+ Get_Name_String (Data.Display_Object_Dir);
Object_Dir : Dir_Type;
Filename : String (1 .. 255);
Last : Natural;
if Is_Obj (Filename (1 .. Last)) then
declare
- Object_Path : String :=
+ Object_Path : constant String :=
Normalize_Pathname
(Object_Dir_Path & Directory_Separator &
Filename (1 .. Last));
+ C_Object_Path : String := Object_Path;
+ C_Filename : String := Filename (1 .. Last);
begin
- Canonical_Case_File_Name (Object_Path);
- Canonical_Case_File_Name (Filename (1 .. Last));
+ Canonical_Case_File_Name (C_Object_Path);
+ Canonical_Case_File_Name (C_Filename);
-- If in the object directory of an extended project,
-- do not consider generated object files.
if In_Main_Object_Directory
or else Last < 5
- or else Filename (1 .. B_Start'Length) /= B_Start.all
+ or else C_Filename (1 .. B_Start'Length) /=
+ B_Start.all
then
Name_Len := Last;
- Name_Buffer (1 .. Name_Len) := Filename (1 .. Last);
+ Name_Buffer (1 .. Name_Len) :=
+ C_Filename (1 .. Last);
Id := Name_Find;
if not Objects_Htable.Get (Id) then
-
- -- Record this object file
-
- Objects_Htable.Set (Id, True);
- Objects.Increment_Last;
- Objects.Table (Objects.Last) :=
- new String'(Object_Path);
-
declare
ALI_File : constant String :=
- Ext_To (Object_Path, "ali");
+ Ext_To
+ (C_Filename
+ (1 .. Last), "ali");
+ ALI_Path : constant String :=
+ Ext_To (C_Object_Path, "ali");
+ Add_It : Boolean :=
+ There_Are_Foreign_Sources
+ or else
+ (Last > 5
+ and then
+ C_Filename
+ (1 .. B_Start'Length) =
+ B_Start.all);
+ Fname : File_Name_Type;
+ Proj : Project_Id;
begin
- if Is_Regular_File (ALI_File) then
-
- -- Record the ALI file
-
- ALIs.Increment_Last;
- ALIs.Table (ALIs.Last) :=
- new String'(ALI_File);
-
- -- Find out if for this ALI file,
- -- libgnarl or libdecgnat or g-trasym.obj
- -- (on OpenVMS) is necessary.
-
- Check_Libs (ALI_File);
-
- else
- -- Object file is a foreign object file
-
- Foreigns.Increment_Last;
- Foreigns.Table (Foreigns.Last) :=
- new String'(Object_Path);
+ if Is_Regular_File (ALI_Path) then
+
+ -- If there is an ALI file, check if the
+ -- object file should be added to the
+ -- library. If there are foreign sources
+ -- we put all object files in the library.
+
+ if not Add_It then
+ for Index in
+ 1 .. Unit_Table.Last (In_Tree.Units)
+ loop
+ if In_Tree.Units.Table
+ (Index).File_Names
+ (Body_Part).Name /= No_File
+ then
+ Proj :=
+ In_Tree.Units.Table (Index).
+ File_Names
+ (Body_Part).Project;
+ Fname :=
+ In_Tree.Units.Table (Index).
+ File_Names (Body_Part).Name;
+
+ elsif
+ In_Tree.Units.Table
+ (Index).File_Names
+ (Specification).Name /= No_File
+ then
+ Proj :=
+ In_Tree.Units.Table
+ (Index).File_Names
+ (Specification).Project;
+ Fname :=
+ In_Tree.Units.Table
+ (Index).File_Names
+ (Specification).Name;
+
+ else
+ Proj := No_Project;
+ end if;
+
+ Add_It := Proj /= No_Project;
+
+ -- If the source is in the project
+ -- or a project it extends, we may
+ -- put it in the library.
+
+ if Add_It then
+ Add_It := Check_Project (Proj);
+ end if;
+
+ -- But we don't, if the ALI file
+ -- does not correspond to the unit.
+
+ if Add_It then
+ declare
+ F : constant String :=
+ Ext_To
+ (Get_Name_String
+ (Fname), "ali");
+ begin
+ Add_It := F = ALI_File;
+ end;
+ end if;
+
+ exit when Add_It;
+ end loop;
+ end if;
+
+ if Add_It then
+ Objects_Htable.Set (Id, True);
+ Objects.Append
+ (new String'(Object_Path));
+
+ -- Record the ALI file
+
+ ALIs.Append (new String'(ALI_Path));
+
+ -- Find out if for this ALI file,
+ -- libgnarl or libdecgnat or
+ -- g-trasym.obj (on OpenVMS) is
+ -- necessary.
+
+ Check_Libs (ALI_Path, True);
+ end if;
+
+ elsif There_Are_Foreign_Sources then
+ Objects.Append (new String'(Object_Path));
end if;
end;
end if;
end;
end if;
- if Libgnarl_Needed then
+ if Libgnarl_Needed = Yes then
Opts.Increment_Last;
if The_Build_Mode = Static then
new Argument_List'
(Argument_List (Objects.Table (1 .. Objects.Last)));
- Foreign_Objects :=
- new Argument_List'(Argument_List
- (Foreigns.Table (1 .. Foreigns.Last)));
-
Ali_Files :=
new Argument_List'(Argument_List (ALIs.Table (1 .. ALIs.Last)));
Write_Str (" library for project ");
Write_Line (Project_Name);
- -- Only output the list of object files and ALI files in verbose
- -- mode.
+ -- Only output list of object files and ALI files in verbose mode
if Opt.Verbose_Mode then
Write_Eol;
Check_Context;
- -- Delete the existing library file, if it exists.
- -- Fail if the library file is not writable, or if it is not possible
- -- to delete the file.
+ -- Delete the existing library file, if it exists. Fail if the
+ -- library file is not writable, or if it is not possible to delete
+ -- the file.
declare
DLL_Name : aliased String :=
- Lib_Dirpath.all & '/' & DLL_Prefix &
+ Lib_Dirpath.all & Directory_Separator & DLL_Prefix &
Lib_Filename.all & "." & DLL_Ext;
Archive_Name : aliased String :=
- Lib_Dirpath.all & "/lib" &
+ Lib_Dirpath.all & Directory_Separator & "lib" &
Lib_Filename.all & "." & Archive_Ext;
type Str_Ptr is access all String;
-- Designates the full library path name. Either DLL_Name or
-- Archive_Name, depending on the library kind.
- Success : Boolean := False;
+ Success : Boolean;
+ pragma Warnings (Off, Success);
-- Used to call Delete_File
begin
begin
while Iface /= Nil_String loop
ALI :=
- In_Tree.String_Elements.Table (Iface).Value;
+ File_Name_Type
+ (In_Tree.String_Elements.Table (Iface).Value);
Interface_ALIs.Set (ALI, True);
Get_Name_String
(In_Tree.String_Elements.Table (Iface).Value);
Add_Argument (Name_Buffer (1 .. Name_Len));
- Iface :=
- In_Tree.String_Elements.Table (Iface).Next;
+ Iface := In_Tree.String_Elements.Table (Iface).Next;
end loop;
Iface := Data.Lib_Interface_ALIs;
-- interface. If it is not the case, output a warning.
while Iface /= Nil_String loop
- ALI := In_Tree.String_Elements.Table
- (Iface).Value;
+ ALI :=
+ File_Name_Type
+ (In_Tree.String_Elements.Table (Iface).Value);
Process (ALI);
- Iface :=
- In_Tree.String_Elements.Table (Iface).Next;
+ Iface := In_Tree.String_Elements.Table (Iface).Next;
end loop;
end if;
end;
Last : Natural;
Disregard : Boolean;
+ pragma Warnings (Off, Disregard);
DLL_Name : aliased constant String :=
Lib_Filename.all & "." & DLL_Ext;
Read (Dir, Name, Last);
exit when Last = 0;
- if Is_Regular_File (Name (1 .. Last)) then
- Canonical_Case_File_Name (Name (1 .. Last));
- Delete := False;
-
- if (The_Build_Mode = Static and then
- Name (1 .. Last) = Archive_Name)
- or else
- ((The_Build_Mode = Dynamic or else
- The_Build_Mode = Relocatable)
- and then
- Name (1 .. Last) = DLL_Name)
- then
- Delete := True;
+ declare
+ Filename : constant String := Name (1 .. Last);
- elsif Last > 4 and then Name (Last - 3 .. Last) = ".ali" then
- declare
- Unit : Unit_Data;
- begin
- -- Compare with ALI file names of the project
+ begin
+ if Is_Regular_File (Filename) then
+ Canonical_Case_File_Name (Name (1 .. Last));
+ Delete := False;
- for Index in 1 .. Unit_Table.Last (In_Tree.Units) loop
- Unit := In_Tree.Units.Table (Index);
+ if (The_Build_Mode = Static and then
+ Name (1 .. Last) = Archive_Name)
+ or else
+ ((The_Build_Mode = Dynamic or else
+ The_Build_Mode = Relocatable)
+ and then
+ Name (1 .. Last) = DLL_Name)
+ then
+ Delete := True;
- if Unit.File_Names (Body_Part).Project /=
- No_Project
- then
- if Ultimate_Extension_Of
- (Unit.File_Names (Body_Part).Project, In_Tree)
- = For_Project
+ elsif Last > 4
+ and then Name (Last - 3 .. Last) = ".ali"
+ then
+ declare
+ Unit : Unit_Data;
+
+ begin
+ -- Compare with ALI file names of the project
+
+ for Index in
+ 1 .. Unit_Table.Last (In_Tree.Units)
+ loop
+ Unit := In_Tree.Units.Table (Index);
+
+ if Unit.File_Names (Body_Part).Project /=
+ No_Project
+ then
+ if Ultimate_Extension_Of
+ (Unit.File_Names (Body_Part).Project,
+ In_Tree) = For_Project
+ then
+ Get_Name_String
+ (Unit.File_Names (Body_Part).Name);
+ Name_Len := Name_Len -
+ File_Extension
+ (Name (1 .. Name_Len))'Length;
+ if Name_Buffer (1 .. Name_Len) =
+ Name (1 .. Last - 4)
+ then
+ Delete := True;
+ exit;
+ end if;
+ end if;
+
+ elsif Ultimate_Extension_Of
+ (Unit.File_Names (Specification).Project,
+ In_Tree) = For_Project
then
Get_Name_String
- (Unit.File_Names (Body_Part).Name);
- Name_Len := Name_Len -
+ (Unit.File_Names (Specification).Name);
+ Name_Len :=
+ Name_Len -
File_Extension
(Name (1 .. Name_Len))'Length;
+
if Name_Buffer (1 .. Name_Len) =
- Name (1 .. Last - 4)
+ Name (1 .. Last - 4)
then
Delete := True;
exit;
end if;
end if;
+ end loop;
+ end;
+ end if;
- elsif Ultimate_Extension_Of
- (Unit.File_Names (Specification).Project, In_Tree)
- = For_Project
- then
- Get_Name_String
- (Unit.File_Names (Specification).Name);
- Name_Len := Name_Len -
- File_Extension (Name (1 .. Name_Len))'Length;
-
- if Name_Buffer (1 .. Name_Len) =
- Name (1 .. Last - 4)
- then
- Delete := True;
- exit;
- end if;
- end if;
- end loop;
- end;
- end if;
-
- if Delete then
- Set_Writable (Name (1 .. Last));
- Delete_File (Name (1 .. Last), Disregard);
+ if Delete then
+ Set_Writable (Filename);
+ Delete_File (Filename, Disregard);
+ end if;
end if;
- end if;
+ end;
end loop;
Close (Dir);
when Dynamic | Relocatable =>
Build_Dynamic_Library
(Ofiles => Object_Files.all,
- Foreign => Foreign_Objects.all,
- Afiles => Ali_Files.all,
Options => Options.all,
- Options_2 => No_Argument_List,
Interfaces => Arguments (1 .. Argument_Number),
Lib_Filename => Lib_Filename.all,
Lib_Dir => Lib_Dirpath.all,
when Static =>
MLib.Build_Library
(Object_Files.all,
- Ali_Files.all,
Lib_Filename.all,
Lib_Dirpath.all);
null;
end case;
- -- We need to copy the ALI files from the object directory to
- -- the library ALI directory, so that the linker find them there,
- -- and does not need to look in the object directory where it
- -- would also find the object files; and we don't want that:
- -- we want the linker to use the library.
+ -- We need to copy the ALI files from the object directory to the
+ -- library ALI directory, so that the linker find them there, and
+ -- does not need to look in the object directory where it would also
+ -- find the object files; and we don't want that: we want the linker
+ -- to use the library.
-- Copy the ALI files and make the copies read-only. For interfaces,
-- mark the copies as interfaces.
if Standalone
and then In_Tree.Projects.Table
- (For_Project).Library_Src_Dir /= No_Name
+ (For_Project).Library_Src_Dir /= No_Path
then
-- Clean the interface copy directory: remove any source that
-- could be a source of the project.
Last : Natural;
Disregard : Boolean;
+ pragma Warnings (Off, Disregard);
begin
Open (Dir, ".");
In_Tree => In_Tree,
Interfaces => Arguments (1 .. Argument_Number),
To_Dir => In_Tree.Projects.Table
- (For_Project).Library_Src_Dir);
+ (For_Project).Display_Library_Src_Dir);
end if;
end if;
if Data.Library then
declare
- Lib_Name : constant Name_Id :=
+ Lib_Name : constant File_Name_Type :=
Library_File_Name_For (For_Project, In_Tree);
begin
Change_Dir (Get_Name_String (Data.Library_Dir));
if not Data.Externally_Built
and then not Data.Need_To_Build_Lib
- and then Data.Object_Directory /= No_Name
+ and then Data.Object_Directory /= No_Path
then
declare
Obj_TS : Time_Stamp_Type;
then
-- Get the object file time stamp
- Obj_TS := File_Stamp (Name_Find);
+ Obj_TS := File_Stamp (File_Name_Type'(Name_Find));
-- If library file time stamp is earlier, set
- -- Need_To_Build_Lib and return. String comparaison is
+ -- Need_To_Build_Lib and return. String comparison is
-- used, otherwise time stamps may be too close and the
- -- comparaison would return True, which would trigger
+ -- comparison would return True, which would trigger
-- an unnecessary rebuild of the library.
if String (Lib_TS) < String (Obj_TS) then
(For_Project : Project_Id;
In_Tree : Project_Tree_Ref;
Interfaces : Argument_List;
- To_Dir : Name_Id)
+ To_Dir : Path_Name_Type)
is
Current : constant Dir_Name_Str := Get_Current_Dir;
-- The current directory, where to return to at the end
Text : Text_Buffer_Ptr;
The_ALI : ALI.ALI_Id;
- Lib_File : Name_Id;
+ Lib_File : File_Name_Type;
First_Unit : ALI.Unit_Id;
Second_Unit : ALI.Unit_Id;
Copy_Subunits : Boolean := False;
-- When True, indicates that subunits, if any, need to be copied too
- procedure Copy (File_Name : Name_Id);
+ procedure Copy (File_Name : File_Name_Type);
-- Copy one source of the project to the target directory
function Is_Same_Or_Extension
-- Copy --
----------
- procedure Copy (File_Name : Name_Id) is
- Success : Boolean := False;
+ procedure Copy (File_Name : File_Name_Type) is
+ Success : Boolean;
+ pragma Warnings (Off, Success);
begin
Unit_Loop :
(Extending : Project_Id;
Extended : Project_Id) return Boolean
is
- Ext : Project_Id := Extending;
+ Ext : Project_Id;
begin
+ Ext := Extending;
while Ext /= No_Project loop
if Ext = Extended then
return True;
Fd : FILEs;
-- Binder file's descriptor
- Read_Mode : constant String := "r" & ASCII.Nul;
+ Read_Mode : constant String := "r" & ASCII.NUL;
-- For fopen
Status : Interfaces.C_Streams.int;
begin
Objects.Init;
Objects_Htable.Reset;
- Foreigns.Init;
ALIs.Init;
Opts.Init;
Processed_Projects.Reset;
OSDN Git Service
