-- --
-- B o d y --
-- --
--- Copyright (C) 1996-2009, Free Software Foundation, Inc. --
+-- Copyright (C) 1996-2012, Free Software Foundation, Inc. --
-- --
-- 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- --
with GNAT.Directory_Operations; use GNAT.Directory_Operations;
with Csets;
-with Makeutl;
+with Hostparm; use Hostparm;
+with Makeutl; use Makeutl;
with MLib.Tgt; use MLib.Tgt;
with MLib.Utl;
with MLib.Fil;
with Namet; use Namet;
with Opt; use Opt;
with Osint; use Osint;
-with Output;
+with Output; use Output;
with Prj; use Prj;
with Prj.Env;
with Prj.Ext; use Prj.Ext;
with Prj.Pars;
+with Prj.Tree; use Prj.Tree;
with Prj.Util; use Prj.Util;
+with Sdefault;
with Sinput.P;
with Snames; use Snames;
with Table;
with Targparm;
with Tempdir;
with Types; use Types;
-with Hostparm; use Hostparm;
--- Used to determine if we are in VMS or not for error message purposes
+with VMS_Conv; use VMS_Conv;
+with VMS_Cmds; use VMS_Cmds;
with Ada.Characters.Handling; use Ada.Characters.Handling;
with Ada.Command_Line; use Ada.Command_Line;
with Ada.Text_IO; use Ada.Text_IO;
-with GNAT.OS_Lib; use GNAT.OS_Lib;
-
-with VMS_Conv; use VMS_Conv;
+with GNAT.OS_Lib; use GNAT.OS_Lib;
procedure GNATCmd is
- Project_Tree : constant Project_Tree_Ref := new Project_Tree_Data;
+ Project_Node_Tree : Project_Node_Tree_Ref;
+ Root_Environment : Prj.Tree.Environment;
Project_File : String_Access;
Project : Prj.Project_Id;
Current_Verbosity : Prj.Verbosity := Prj.Default;
B_Start : String_Ptr := new String'("b~");
-- Prefix of binder generated file, changed to b__ for VMS
+ Project_Tree : constant Project_Tree_Ref :=
+ new Project_Tree_Data (Is_Root_Tree => True);
+ -- The project tree
+
Old_Project_File_Used : Boolean := False;
-- This flag indicates a switch -p (for gnatxref and gnatfind) for
-- an old fashioned project file. -p cannot be used in conjunction
Naming_String : constant SA := new String'("naming");
Binder_String : constant SA := new String'("binder");
+ Builder_String : constant SA := new String'("builder");
Compiler_String : constant SA := new String'("compiler");
Check_String : constant SA := new String'("check");
Synchronize_String : constant SA := new String'("synchronize");
new String_List'((Naming_String, Binder_String));
Packages_To_Check_By_Check : constant String_List_Access :=
- new String_List'((Naming_String, Check_String, Compiler_String));
+ new String_List'
+ ((Naming_String, Builder_String, Check_String, Compiler_String));
Packages_To_Check_By_Sync : constant String_List_Access :=
new String_List'((Naming_String, Synchronize_String, Compiler_String));
-- indicate that the underlying tool (gnatcheck, gnatpp or gnatmetric)
-- should be invoked for all sources of all projects.
+ Max_OpenVMS_Logical_Length : constant Integer := 255;
+ -- The maximum length of OpenVMS logicals
+
-----------------------
-- Local Subprograms --
-----------------------
procedure Check_Files;
-- For GNAT LIST, GNAT PRETTY, GNAT METRIC, and GNAT STACK, check if a
- -- project file is specified, without any file arguments. If it is the
- -- case, invoke the GNAT tool with the proper list of files, derived from
- -- the sources of the project.
+ -- project file is specified, without any file arguments and without a
+ -- switch -files=. If it is the case, invoke the GNAT tool with the proper
+ -- list of files, derived from the sources of the project.
function Check_Project
(Project : Project_Id;
-- STUB), gnatpp (GNAT PRETTY), gnatelim (GNAT ELIM), and gnatmetric (GNAT
-- METRIC).
+ function Mapping_File return Path_Name_Type;
+ -- Create and return the path name of a mapping file. Used for gnatstub
+ -- (GNAT STUB), gnatpp (GNAT PRETTY), gnatelim (GNAT ELIM), and gnatmetric
+ -- (GNAT METRIC).
+
procedure Delete_Temp_Config_Files;
-- Delete all temporary config files. The caller is responsible for
-- ensuring that Keep_Temporary_Files is False.
-- Get the sources in the closure of the ASIS_Main and add them to the
-- list of arguments.
- function Index (Char : Character; Str : String) return Natural;
- -- Returns first occurrence of Char in Str, returns 0 if Char not in Str
-
procedure Non_VMS_Usage;
-- Display usage for platforms other than VMS
procedure Set_Library_For
(Project : Project_Id;
+ Tree : Project_Tree_Ref;
Libraries_Present : in out Boolean);
-- If Project is a library project, add the correct -L and -l switches to
-- the linker invocation.
procedure Check_Files is
Add_Sources : Boolean := True;
- Unit_Data : Prj.Unit_Data;
+ Unit : Prj.Unit_Index;
Subunit : Boolean := False;
FD : File_Descriptor := Invalid_FD;
Status : Integer;
Success : Boolean;
+ procedure Add_To_Response_File
+ (File_Name : String;
+ Check_File : Boolean := True);
+ -- Include the file name passed as parameter in the response file for
+ -- the tool being called. If the response file can not be written then
+ -- the file name is passed in the parameter list of the tool. If the
+ -- Check_File parameter is True then the procedure verifies the
+ -- existence of the file before adding it to the response file.
+
+ --------------------------
+ -- Add_To_Response_File --
+ --------------------------
+
+ procedure Add_To_Response_File
+ (File_Name : String;
+ Check_File : Boolean := True)
+ is
+ begin
+ Name_Len := 0;
+
+ Add_Str_To_Name_Buffer (File_Name);
+
+ if not Check_File or else
+ Is_Regular_File (Name_Buffer (1 .. Name_Len))
+ then
+ if FD /= Invalid_FD then
+ Name_Len := Name_Len + 1;
+ Name_Buffer (Name_Len) := ASCII.LF;
+
+ Status := Write (FD, Name_Buffer (1)'Address, Name_Len);
+
+ if Status /= Name_Len then
+ Osint.Fail ("disk full");
+ end if;
+ else
+ Last_Switches.Increment_Last;
+ Last_Switches.Table (Last_Switches.Last) :=
+ new String'(File_Name);
+ end if;
+ end if;
+ end Add_To_Response_File;
+
+ -- Start of processing for Check_Files
+
begin
- -- Check if there is at least one argument that is not a switch
+ -- Check if there is at least one argument that is not a switch or if
+ -- there is a -files= switch.
for Index in 1 .. Last_Switches.Last loop
- if Last_Switches.Table (Index) (1) /= '-' then
+ if Last_Switches.Table (Index).all'Length > 7
+ and then Last_Switches.Table (Index) (1 .. 7) = "-files="
+ then
Add_Sources := False;
exit;
+
+ elsif Last_Switches.Table (Index) (1) /= '-' then
+ if Index = 1
+ or else
+ (The_Command = Check
+ and then Last_Switches.Table (Index - 1).all /= "-o")
+ or else
+ (The_Command = Pretty
+ and then Last_Switches.Table (Index - 1).all /= "-o"
+ and then Last_Switches.Table (Index - 1).all /= "-of")
+ or else
+ (The_Command = Metric
+ and then
+ Last_Switches.Table (Index - 1).all /= "-o" and then
+ Last_Switches.Table (Index - 1).all /= "-og" and then
+ Last_Switches.Table (Index - 1).all /= "-ox" and then
+ Last_Switches.Table (Index - 1).all /= "-d")
+ or else
+ (The_Command /= Check and then
+ The_Command /= Pretty and then
+ The_Command /= Metric)
+ then
+ Add_Sources := False;
+ exit;
+ end if;
end if;
end loop;
- -- If all arguments were switches, add the path names of all the sources
- -- of the main project.
+ -- If all arguments are switches and there is no switch -files=, add
+ -- the path names of all the sources of the main project.
if Add_Sources then
- -- For gnatcheck, gnatpp and gnatmetric , create a temporary file and
- -- put the list of sources in it.
+ -- For gnatcheck, gnatpp, and gnatmetric, create a temporary file
+ -- and put the list of sources in it. For gnatstack create a
+ -- temporary file with the list of .ci files.
if The_Command = Check or else
The_Command = Pretty or else
- The_Command = Metric
+ The_Command = Metric or else
+ The_Command = Stack
then
Tempdir.Create_Temp_File (FD, Temp_File_Name);
Last_Switches.Increment_Last;
if Check_Project (Proj.Project, Project) then
declare
Main : String_List_Id;
- File : String_Access;
begin
-- Include binder generated files for main programs
Main := Proj.Project.Mains;
while Main /= Nil_String loop
- File :=
- new String'
- (Get_Name_String
- (Proj.Project.Object_Directory.Name) &
- Directory_Separator &
- B_Start.all &
- MLib.Fil.Ext_To
- (Get_Name_String
- (Project_Tree.String_Elements.Table
- (Main).Value),
- "ci"));
-
- if Is_Regular_File (File.all) then
- Last_Switches.Increment_Last;
- Last_Switches.Table (Last_Switches.Last) := File;
+ Add_To_Response_File
+ (Get_Name_String
+ (Proj.Project.Object_Directory.Name) &
+ B_Start.all &
+ MLib.Fil.Ext_To
+ (Get_Name_String
+ (Project_Tree.Shared.String_Elements.Table
+ (Main).Value),
+ "ci"));
+
+ -- When looking for the .ci file for a binder
+ -- generated file, look for both b~xxx and b__xxx
+ -- as gprbuild always uses b__ as the prefix of
+ -- such files.
+
+ if not Is_Regular_File (Name_Buffer (1 .. Name_Len))
+ and then B_Start.all /= "b__"
+ then
+ Add_To_Response_File
+ (Get_Name_String
+ (Proj.Project.Object_Directory.Name) &
+ "b__" &
+ MLib.Fil.Ext_To
+ (Get_Name_String
+ (Project_Tree.Shared
+ .String_Elements.Table (Main).Value),
+ "ci"));
end if;
- Main :=
- Project_Tree.String_Elements.Table (Main).Next;
+ Main := Project_Tree.Shared.String_Elements.Table
+ (Main).Next;
end loop;
if Proj.Project.Library then
-- files that contains the initialization and
-- finalization of the library.
- File :=
- new String'
- (Get_Name_String
- (Proj.Project.Object_Directory.Name) &
- Directory_Separator &
- B_Start.all &
- Get_Name_String (Proj.Project.Library_Name) &
- ".ci");
-
- if Is_Regular_File (File.all) then
- Last_Switches.Increment_Last;
- Last_Switches.Table (Last_Switches.Last) := File;
+ Add_To_Response_File
+ (Get_Name_String
+ (Proj.Project.Object_Directory.Name) &
+ B_Start.all &
+ Get_Name_String (Proj.Project.Library_Name) &
+ ".ci");
+
+ -- When looking for the .ci file for a binder
+ -- generated file, look for both b~xxx and b__xxx
+ -- as gprbuild always uses b__ as the prefix of
+ -- such files.
+
+ if not Is_Regular_File (Name_Buffer (1 .. Name_Len))
+ and then B_Start.all /= "b__"
+ then
+ Add_To_Response_File
+ (Get_Name_String
+ (Proj.Project.Object_Directory.Name) &
+ "b__" &
+ Get_Name_String (Proj.Project.Library_Name) &
+ ".ci");
end if;
end if;
end;
end loop;
end if;
- for Unit in Unit_Table.First ..
- Unit_Table.Last (Project_Tree.Units)
- loop
- Unit_Data := Project_Tree.Units.Table (Unit);
+ Unit := Units_Htable.Get_First (Project_Tree.Units_HT);
+ while Unit /= No_Unit_Index loop
-- For gnatls, we only need to put the library units, body or
-- spec, but not the subunits.
if The_Command = List then
- if Unit_Data.File_Names (Impl) /= null
- and then Unit_Data.File_Names (Impl).Path.Name /= Slash
+ if Unit.File_Names (Impl) /= null
+ and then not Unit.File_Names (Impl).Locally_Removed
then
-- There is a body, check if it is for this project
- if All_Projects or else
- Unit_Data.File_Names (Impl).Project = Project
+ if All_Projects
+ or else Unit.File_Names (Impl).Project = Project
then
Subunit := False;
- if Unit_Data.File_Names (Spec) = null
- or else Unit_Data.File_Names (Spec).Path.Name = Slash
+ if Unit.File_Names (Spec) = null
+ or else Unit.File_Names (Spec).Locally_Removed
then
-- We have a body with no spec: we need to check if
-- this is a subunit, because gnatls will complain
Src_Ind : constant Source_File_Index :=
Sinput.P.Load_Project_File
(Get_Name_String
- (Unit_Data.File_Names
+ (Unit.File_Names
(Impl).Path.Name));
begin
Subunit :=
Last_Switches.Table (Last_Switches.Last) :=
new String'
(Get_Name_String
- (Unit_Data.File_Names
+ (Unit.File_Names
(Impl).Display_File));
end if;
end if;
- elsif Unit_Data.File_Names (Spec) /= null
- and then Unit_Data.File_Names (Spec).Path.Name /= Slash
+ elsif Unit.File_Names (Spec) /= null
+ and then not Unit.File_Names (Spec).Locally_Removed
then
-- We have a spec with no body. Check if it is for this
-- project.
if All_Projects or else
- Unit_Data.File_Names (Spec).Project = Project
+ Unit.File_Names (Spec).Project = Project
then
Last_Switches.Increment_Last;
Last_Switches.Table (Last_Switches.Last) :=
- new String'
- (Get_Name_String
- (Unit_Data.File_Names
- (Spec).Display_File));
+ new String'(Get_Name_String
+ (Unit.File_Names (Spec).Display_File));
end if;
end if;
-- but not the subunits.
elsif The_Command = Stack then
- if Unit_Data.File_Names (Impl) /= null
- and then Unit_Data.File_Names (Impl).Path.Name /= Slash
+ if Unit.File_Names (Impl) /= null
+ and then not Unit.File_Names (Impl).Locally_Removed
then
-- There is a body. Check if .ci files for this project
-- must be added.
if Check_Project
- (Unit_Data.File_Names (Impl).Project, Project)
+ (Unit.File_Names (Impl).Project, Project)
then
Subunit := False;
- if Unit_Data.File_Names (Spec) = null
- or else Unit_Data.File_Names (Spec).Path.Name = Slash
+ if Unit.File_Names (Spec) = null
+ or else Unit.File_Names (Spec).Locally_Removed
then
-- We have a body with no spec: we need to check
-- if this is a subunit, because .ci files are not
Src_Ind : constant Source_File_Index :=
Sinput.P.Load_Project_File
(Get_Name_String
- (Unit_Data.File_Names
+ (Unit.File_Names
(Impl).Path.Name));
begin
Subunit :=
end if;
if not Subunit then
- Last_Switches.Increment_Last;
- Last_Switches.Table (Last_Switches.Last) :=
- new String'
- (Get_Name_String
- (Unit_Data.File_Names
- (Impl).Project.
- Object_Directory.Name) &
- Directory_Separator &
- MLib.Fil.Ext_To
- (Get_Name_String
- (Unit_Data.File_Names
- (Impl).Display_File),
- "ci"));
+ Add_To_Response_File
+ (Get_Name_String
+ (Unit.File_Names
+ (Impl).Project. Object_Directory.Name) &
+ MLib.Fil.Ext_To
+ (Get_Name_String
+ (Unit.File_Names (Impl).Display_File),
+ "ci"));
end if;
end if;
- elsif Unit_Data.File_Names (Spec) /= null
- and then Unit_Data.File_Names (Spec).Path.Name /= Slash
+ elsif Unit.File_Names (Spec) /= null
+ and then not Unit.File_Names (Spec).Locally_Removed
then
- -- We have a spec with no body. Check if it is for this
- -- project.
+ -- Spec with no body, check if it is for this project
if Check_Project
- (Unit_Data.File_Names (Spec).Project, Project)
+ (Unit.File_Names (Spec).Project, Project)
then
- Last_Switches.Increment_Last;
- Last_Switches.Table (Last_Switches.Last) :=
- new String'
- (Get_Name_String
- (Unit_Data.File_Names
- (Spec).Project.
- Object_Directory.Name) &
- Dir_Separator &
- MLib.Fil.Ext_To
- (Get_Name_String
- (Unit_Data.File_Names (Spec).File),
- "ci"));
+ Add_To_Response_File
+ (Get_Name_String
+ (Unit.File_Names
+ (Spec).Project. Object_Directory.Name) &
+ Dir_Separator &
+ MLib.Fil.Ext_To
+ (Get_Name_String (Unit.File_Names (Spec).File),
+ "ci"));
end if;
end if;
-- specified.
for Kind in Spec_Or_Body loop
- if Unit_Data.File_Names (Kind) /= null
+ if Unit.File_Names (Kind) /= null
and then Check_Project
- (Unit_Data.File_Names (Kind).Project, Project)
- and then Unit_Data.File_Names (Kind).Path.Name /= Slash
+ (Unit.File_Names (Kind).Project, Project)
+ and then not Unit.File_Names (Kind).Locally_Removed
then
- Get_Name_String
- (Unit_Data.File_Names (Kind).Path.Display_Name);
-
- if FD /= Invalid_FD then
- Name_Len := Name_Len + 1;
- Name_Buffer (Name_Len) := ASCII.LF;
- Status :=
- Write (FD, Name_Buffer (1)'Address, Name_Len);
-
- if Status /= Name_Len then
- Osint.Fail ("disk full");
- end if;
-
- else
- Last_Switches.Increment_Last;
- Last_Switches.Table (Last_Switches.Last) :=
- new String'
- (Get_Name_String
- (Unit_Data.File_Names
- (Kind).Path.Display_Name));
- end if;
+ Add_To_Response_File
+ ("""" &
+ Get_Name_String
+ (Unit.File_Names (Kind).Path.Display_Name) &
+ """",
+ Check_File => False);
end if;
end loop;
end if;
+
+ Unit := Units_Htable.Get_Next (Project_Tree.Units_HT);
end loop;
end;
if Project = No_Project then
return False;
- elsif All_Projects or Project = Root_Project then
+ elsif All_Projects or else Project = Root_Project then
return True;
elsif The_Command = Metric then
function Configuration_Pragmas_File return Path_Name_Type is
begin
- Prj.Env.Create_Config_Pragmas_File
- (Project, Project, Project_Tree, Include_Config_Files => False);
+ Prj.Env.Create_Config_Pragmas_File (Project, Project_Tree);
return Project.Config_File_Name;
end Configuration_Pragmas_File;
Proj := Project_Tree.Projects;
while Proj /= null loop
if Proj.Project.Config_File_Temp then
- if Verbose_Mode then
- Output.Write_Str ("Deleting temp configuration file """);
- Output.Write_Str
- (Get_Name_String (Proj.Project.Config_File_Name));
- Output.Write_Line ("""");
- end if;
-
- Delete_File
- (Name => Get_Name_String (Proj.Project.Config_File_Name),
- Success => Success);
+ Delete_Temporary_File
+ (Project_Tree.Shared, Proj.Project.Config_File_Name);
end if;
Proj := Proj.Next;
-- has been created, delete this temporary file.
if Temp_File_Name /= No_Path then
- Delete_File (Get_Name_String (Temp_File_Name), Success);
+ Delete_Temporary_File (Project_Tree.Shared, Temp_File_Name);
end if;
end Delete_Temp_Config_Files;
-- Used to read file if there is an error, it is good enough to display
-- just 250 characters if the first line of the file is very long.
- Udata : Unit_Data;
+ Unit : Unit_Index;
Path : Path_Name_Type;
begin
Return_Code => Return_Code,
Err_To_Out => True);
- Close (FD);
-
-- Read the output of the invocation of gnatmake
Open (File, In_File, Get_Name_String (Name));
if Return_Code /= 0 then
Get_Line (File, Line, Last);
- if not Keep_Temporary_Files then
- Delete (File);
- else
- Close (File);
- end if;
+ begin
+ if not Keep_Temporary_Files then
+ Delete (File);
+ else
+ Close (File);
+ end if;
+
+ -- Don't crash if it is not possible to delete or close the file,
+ -- just ignore the situation.
+
+ exception
+ when others =>
+ null;
+ end;
Put_Line (Standard_Error, Line (1 .. Last));
Put_Line
Get_Line (File, Line, Last);
Path := No_Path;
- for Unit in Unit_Table.First ..
- Unit_Table.Last (Project_Tree.Units)
- loop
- Udata := Project_Tree.Units.Table (Unit);
-
- if Udata.File_Names (Spec) /= null
+ Unit := Units_Htable.Get_First (Project_Tree.Units_HT);
+ while Unit /= No_Unit_Index loop
+ if Unit.File_Names (Spec) /= null
and then
- Get_Name_String (Udata.File_Names (Spec).File) =
+ Get_Name_String (Unit.File_Names (Spec).File) =
Line (1 .. Last)
then
- Path := Udata.File_Names (Spec).Path.Name;
+ Path := Unit.File_Names (Spec).Path.Name;
exit;
- elsif Udata.File_Names (Impl) /= null
+ elsif Unit.File_Names (Impl) /= null
and then
- Get_Name_String (Udata.File_Names (Impl).File) =
+ Get_Name_String (Unit.File_Names (Impl).File) =
Line (1 .. Last)
then
- Path := Udata.File_Names (Impl).Path.Name;
+ Path := Unit.File_Names (Impl).Path.Name;
exit;
end if;
+
+ Unit := Units_Htable.Get_Next (Project_Tree.Units_HT);
end loop;
Last_Switches.Increment_Last;
end if;
end loop;
- if not Keep_Temporary_Files then
- Delete (File);
- else
- Close (File);
- end if;
+ begin
+ if not Keep_Temporary_Files then
+ Delete (File);
+ else
+ Close (File);
+ end if;
+
+ -- Don't crash if it is not possible to delete or close the file,
+ -- just ignore the situation.
+
+ exception
+ when others =>
+ null;
+ end;
end if;
end Get_Closure;
- -----------
- -- Index --
- -----------
+ ------------------
+ -- Mapping_File --
+ ------------------
- function Index (Char : Character; Str : String) return Natural is
+ function Mapping_File return Path_Name_Type is
+ Result : Path_Name_Type;
begin
- for Index in Str'Range loop
- if Str (Index) = Char then
- return Index;
- end if;
- end loop;
-
- return 0;
- end Index;
+ Prj.Env.Create_Mapping_File
+ (Project => Project,
+ Language => Name_Ada,
+ In_Tree => Project_Tree,
+ Name => Result);
+ return Result;
+ end Mapping_File;
------------------
-- Process_Link --
-- Check if there are library project files
if MLib.Tgt.Support_For_Libraries /= None then
- Set_Libraries (Project, Libraries_Present);
+ Set_Libraries (Project, Project_Tree, Libraries_Present);
end if;
-- If there are, add the necessary additional switches
-- Append ".ali" if file name does not end with it
if Switch'Length <= 4
- or else Switch (Switch'Last - 3 .. Switch'Last)
- /= ".ali"
+ or else Switch (Switch'Last - 3 .. Switch'Last) /= ".ali"
then
Last := ALI_File'Last;
end if;
else
for K in Switch'Range loop
- if Switch (K) = '/' or else
- Switch (K) = Directory_Separator
+ if Switch (K) = '/'
+ or else Switch (K) = Directory_Separator
then
Test_Existence := True;
exit;
begin
if Is_Regular_File
(Dir &
- Directory_Separator &
ALI_File (1 .. Last))
then
-- We have found the correct project, so we
-- replace the file with the absolute path.
Last_Switches.Table (J) :=
- new String'
- (Dir & Directory_Separator &
- ALI_File (1 .. Last));
+ new String'(Dir & ALI_File (1 .. Last));
-- And we are done
Last_Switches.Increment_Last;
Last_Switches.Table (Last_Switches.Last) :=
new String'(Name_Buffer (1 .. Name_Len) &
- Directory_Separator &
Executable_Name
(Base_Name (Arg (Arg'First .. Last))));
exit;
procedure Set_Library_For
(Project : Project_Id;
+ Tree : Project_Tree_Ref;
Libraries_Present : in out Boolean)
is
+ pragma Unreferenced (Tree);
+
Path_Option : constant String_Access :=
MLib.Linker_Library_Path_Option;
is
begin
Makeutl.Test_If_Relative_Path
- (Switch, Parent, Including_Non_Switch => False, Including_RTS => True);
+ (Switch, Parent,
+ Do_Fail => Osint.Fail'Access,
+ Including_Non_Switch => False,
+ Including_RTS => True);
end Test_If_Relative_Path;
-------------------
New_Line;
for C in Command_List'Range loop
- if not Command_List (C).VMS_Only then
+
+ -- No usage for VMS only command or for Sync
+
+ if not Command_List (C).VMS_Only and then C /= Sync then
if Targparm.AAMP_On_Target then
Put ("gnaampcmd ");
else
end loop;
New_Line;
- Put_Line ("Commands find, list, metric, pretty, stack, stub and xref " &
+ Put_Line ("All commands except chop, krunch and preprocess " &
"accept project file switches -vPx, -Pprj and -Xnam=val");
New_Line;
end Non_VMS_Usage;
- -------------------------------------
- -- Start of processing for GNATCmd --
- -------------------------------------
+-- Start of processing for GNATCmd
begin
+ -- All output from GNATCmd is debugging or error output: send to stderr
+
+ Set_Standard_Error;
+
-- Initializations
- Namet.Initialize;
Csets.Initialize;
-
Snames.Initialize;
+ Prj.Tree.Initialize (Root_Environment, Gnatmake_Flags);
+ Prj.Env.Initialize_Default_Project_Path
+ (Root_Environment.Project_Path,
+ Target_Name => Sdefault.Target_Name.all);
+
+ Project_Node_Tree := new Project_Node_Tree_Data;
+ Prj.Tree.Initialize (Project_Node_Tree);
+
Prj.Initialize (Project_Tree);
Last_Switches.Init;
VMS_Conv.Initialize;
- Set_Mode (Ada_Only);
-
-- Add the default search directories, to be able to find system.ads in the
-- subsequent call to Targparm.Get_Target_Parameters.
Targparm.Get_Target_Parameters;
+ -- Put the command line in environment variable GNAT_DRIVER_COMMAND_LINE,
+ -- so that the spawned tool may know the way the GNAT driver was invoked.
+
+ Name_Len := 0;
+ Add_Str_To_Name_Buffer (Command_Name);
+
+ for J in 1 .. Argument_Count loop
+ Add_Char_To_Name_Buffer (' ');
+ Add_Str_To_Name_Buffer (Argument (J));
+ end loop;
+
+ -- On OpenVMS, setenv creates a logical whose length is limited to
+ -- 255 bytes.
+
+ if OpenVMS and then Name_Len > Max_OpenVMS_Logical_Length then
+ Name_Buffer (Max_OpenVMS_Logical_Length - 2
+ .. Max_OpenVMS_Logical_Length) := "...";
+ Name_Len := Max_OpenVMS_Logical_Length;
+ end if;
+
+ Setenv ("GNAT_DRIVER_COMMAND_LINE", Name_Buffer (1 .. Name_Len));
+
-- Add the directory where the GNAT driver is invoked in front of the path,
-- if the GNAT driver is invoked with directory information. Do not do this
-- for VMS, where the notion of path does not really exist.
Normalize_Pathname
(Command (Command'First .. Index));
- PATH : constant String :=
- Absolute_Dir &
- Path_Separator &
- Getenv ("PATH").all;
+ PATH : constant String :=
+ Absolute_Dir & Path_Separator & Getenv ("PATH").all;
begin
Setenv ("PATH", PATH);
begin
if The_Command = Stack then
+
-- Never call gnatstack with a prefix
Program := new String'(Command_List (The_Command).Unixcmd.all);
Program_Name (Command_List (The_Command).Unixcmd.all, "gnat");
end if;
+ -- For the tools where the GNAT driver processes the project files,
+ -- allow shared library projects to import projects that are not shared
+ -- library projects, to avoid adding a switch for these tools. For the
+ -- builder (gnatmake), if a shared library project imports a project
+ -- that is not a shared library project and the appropriate switch is
+ -- not specified, the invocation of gnatmake will fail.
+
+ Opt.Unchecked_Shared_Lib_Imports := True;
+
-- Locate the executable for the command
Exec_Path := Locate_Exec_On_Path (Program.all);
end loop;
end if;
- -- For BIND, CHECK, ELIM, FIND, LINK, LIST, PRETTY, STACK, STUB,
- -- METRIC ad XREF, look for project file related switches.
-
- if The_Command = Bind
- or else The_Command = Check
- or else The_Command = Sync
- or else The_Command = Elim
- or else The_Command = Find
- or else The_Command = Link
- or else The_Command = List
- or else The_Command = Xref
- or else The_Command = Pretty
- or else The_Command = Stack
- or else The_Command = Stub
- or else The_Command = Metric
- then
- case The_Command is
- when Bind =>
- Tool_Package_Name := Name_Binder;
- Packages_To_Check := Packages_To_Check_By_Binder;
- when Check =>
- Tool_Package_Name := Name_Check;
- Packages_To_Check := Packages_To_Check_By_Check;
- when Sync =>
- Tool_Package_Name := Name_Synchronize;
- Packages_To_Check := Packages_To_Check_By_Sync;
- when Elim =>
- Tool_Package_Name := Name_Eliminate;
- Packages_To_Check := Packages_To_Check_By_Eliminate;
- when Find =>
- Tool_Package_Name := Name_Finder;
- Packages_To_Check := Packages_To_Check_By_Finder;
- when Link =>
- Tool_Package_Name := Name_Linker;
- Packages_To_Check := Packages_To_Check_By_Linker;
- when List =>
- Tool_Package_Name := Name_Gnatls;
- Packages_To_Check := Packages_To_Check_By_Gnatls;
- when Metric =>
- Tool_Package_Name := Name_Metrics;
- Packages_To_Check := Packages_To_Check_By_Metric;
- when Pretty =>
- Tool_Package_Name := Name_Pretty_Printer;
- Packages_To_Check := Packages_To_Check_By_Pretty;
- when Stack =>
- Tool_Package_Name := Name_Stack;
- Packages_To_Check := Packages_To_Check_By_Stack;
- when Stub =>
- Tool_Package_Name := Name_Gnatstub;
- Packages_To_Check := Packages_To_Check_By_Gnatstub;
- when Xref =>
- Tool_Package_Name := Name_Cross_Reference;
- Packages_To_Check := Packages_To_Check_By_Xref;
- when others =>
- null;
- end case;
+ -- For BIND, CHECK, ELIM, FIND, LINK, LIST, METRIC, PRETTY, STACK, STUB,
+ -- SYNC and XREF, look for project file related switches.
+
+ case The_Command is
+ when Bind =>
+ Tool_Package_Name := Name_Binder;
+ Packages_To_Check := Packages_To_Check_By_Binder;
+ when Check =>
+ Tool_Package_Name := Name_Check;
+ Packages_To_Check := Packages_To_Check_By_Check;
+ when Elim =>
+ Tool_Package_Name := Name_Eliminate;
+ Packages_To_Check := Packages_To_Check_By_Eliminate;
+ when Find =>
+ Tool_Package_Name := Name_Finder;
+ Packages_To_Check := Packages_To_Check_By_Finder;
+ when Link =>
+ Tool_Package_Name := Name_Linker;
+ Packages_To_Check := Packages_To_Check_By_Linker;
+ when List =>
+ Tool_Package_Name := Name_Gnatls;
+ Packages_To_Check := Packages_To_Check_By_Gnatls;
+ when Metric =>
+ Tool_Package_Name := Name_Metrics;
+ Packages_To_Check := Packages_To_Check_By_Metric;
+ when Pretty =>
+ Tool_Package_Name := Name_Pretty_Printer;
+ Packages_To_Check := Packages_To_Check_By_Pretty;
+ when Stack =>
+ Tool_Package_Name := Name_Stack;
+ Packages_To_Check := Packages_To_Check_By_Stack;
+ when Stub =>
+ Tool_Package_Name := Name_Gnatstub;
+ Packages_To_Check := Packages_To_Check_By_Gnatstub;
+ when Sync =>
+ Tool_Package_Name := Name_Synchronize;
+ Packages_To_Check := Packages_To_Check_By_Sync;
+ when Xref =>
+ Tool_Package_Name := Name_Cross_Reference;
+ Packages_To_Check := Packages_To_Check_By_Xref;
+ when others =>
+ Tool_Package_Name := No_Name;
+ end case;
+
+ if Tool_Package_Name /= No_Name then
-- Check that the switches are consistent. Detect project file
-- related switches.
- Inspect_Switches :
- declare
+ Inspect_Switches : declare
Arg_Num : Positive := 1;
Argv : String_Access;
-- --subdirs=... Specify Subdirs
- if Argv'Length > Makeutl.Subdirs_Option'Length and then
- Argv
- (Argv'First ..
- Argv'First + Makeutl.Subdirs_Option'Length - 1) =
- Makeutl.Subdirs_Option
+ if Argv'Length > Makeutl.Subdirs_Option'Length
+ and then
+ Argv
+ (Argv'First ..
+ Argv'First + Makeutl.Subdirs_Option'Length - 1) =
+ Makeutl.Subdirs_Option
then
Subdirs :=
new String'
elsif Argv'Length > 3
and then Argv (Argv'First + 1 .. Argv'First + 2) = "aP"
then
- Add_Search_Project_Directory
- (Argv (Argv'First + 3 .. Argv'Last));
+ Prj.Env.Add_Directories
+ (Root_Environment.Project_Path,
+ Argv (Argv'First + 3 .. Argv'Last));
Remove_Switch (Arg_Num);
elsif Argv.all = "-eL" then
Follow_Links_For_Files := True;
+ Follow_Links_For_Dirs := True;
Remove_Switch (Arg_Num);
elsif Argv'Length >= 5
and then Argv (Argv'First + 1) = 'X'
then
- declare
- Equal_Pos : constant Natural :=
- Index
- ('=',
- Argv (Argv'First + 2 .. Argv'Last));
- begin
- if Equal_Pos >= Argv'First + 3 and then
- Equal_Pos /= Argv'Last then
- Add (External_Name =>
- Argv (Argv'First + 2 .. Equal_Pos - 1),
- Value => Argv (Equal_Pos + 1 .. Argv'Last));
- else
- Fail
- (Argv.all
+ if not Check (Root_Environment.External,
+ Argv (Argv'First + 2 .. Argv'Last))
+ then
+ Fail (Argv.all
& " is not a valid external assignment.");
- end if;
- end;
+ end if;
Remove_Switch (Arg_Num);
Prj.Pars.Parse
(Project => Project,
In_Tree => Project_Tree,
+ In_Node_Tree => Project_Node_Tree,
Project_File_Name => Project_File.all,
- Packages_To_Check => Packages_To_Check,
- Is_Config_File => False);
+ Env => Root_Environment,
+ Packages_To_Check => Packages_To_Check);
+
+ -- Prj.Pars.Parse calls Set_Standard_Output, reset to stderr
+
+ Set_Standard_Error;
if Project = Prj.No_Project then
Fail ("""" & Project_File.all & """ processing failed");
Prj.Util.Value_Of
(Name => Tool_Package_Name,
In_Packages => Project.Decl.Packages,
- In_Tree => Project_Tree);
+ Shared => Project_Tree.Shared);
Element : Package_Element;
- Default_Switches_Array : Array_Element_Id;
+ Switches_Array : Array_Element_Id;
The_Switches : Prj.Variable_Value;
Current : Prj.String_List_Id;
The_String : String_Element;
+ Main : String_Access := null;
+
begin
if Pkg /= No_Package then
- Element := Project_Tree.Packages.Table (Pkg);
+ Element := Project_Tree.Shared.Packages.Table (Pkg);
-- Packages Gnatls and Gnatstack have a single attribute
-- Switches, that is not an associative array.
Prj.Util.Value_Of
(Variable_Name => Snames.Name_Switches,
In_Variables => Element.Decl.Attributes,
- In_Tree => Project_Tree);
+ Shared => Project_Tree.Shared);
-- Packages Binder (for gnatbind), Cross_Reference (for
-- gnatxref), Linker (for gnatlink), Finder (for gnatfind),
-- name of the programming language.
else
+ -- First check if there is a single main
+
+ for J in 1 .. Last_Switches.Last loop
+ if Last_Switches.Table (J) (1) /= '-' then
+ if Main = null then
+ Main := Last_Switches.Table (J);
+
+ else
+ Main := null;
+ exit;
+ end if;
+ end if;
+ end loop;
+
+ if Main /= null then
+ Switches_Array :=
+ Prj.Util.Value_Of
+ (Name => Name_Switches,
+ In_Arrays => Element.Decl.Arrays,
+ Shared => Project_Tree.Shared);
+ Name_Len := 0;
+ Add_Str_To_Name_Buffer (Main.all);
+ The_Switches := Prj.Util.Value_Of
+ (Index => Name_Find,
+ Src_Index => 0,
+ In_Array => Switches_Array,
+ Shared => Project_Tree.Shared);
+ end if;
+
if The_Switches.Kind = Prj.Undefined then
- Default_Switches_Array :=
+ Switches_Array :=
Prj.Util.Value_Of
(Name => Name_Default_Switches,
In_Arrays => Element.Decl.Arrays,
- In_Tree => Project_Tree);
+ Shared => Project_Tree.Shared);
The_Switches := Prj.Util.Value_Of
(Index => Name_Ada,
Src_Index => 0,
- In_Array => Default_Switches_Array,
- In_Tree => Project_Tree);
+ In_Array => Switches_Array,
+ Shared => Project_Tree.Shared);
end if;
end if;
when Prj.List =>
Current := The_Switches.Values;
while Current /= Prj.Nil_String loop
- The_String := Project_Tree.String_Elements.
+ The_String := Project_Tree.Shared.String_Elements.
Table (Current);
declare
end if;
end;
- if The_Command = Bind
+ if The_Command = Bind
or else The_Command = Link
or else The_Command = Elim
then
-- For gnatcheck, gnatstub, gnatmetric, gnatpp and gnatelim, create
-- a configuration pragmas file, if necessary.
- if The_Command = Pretty
+ if The_Command = Pretty
or else The_Command = Metric
or else The_Command = Stub
or else The_Command = Elim
Prj.Util.Value_Of
(Name => Name_Compiler,
In_Packages => Project.Decl.Packages,
- In_Tree => Project_Tree);
+ Shared => Project_Tree.Shared);
Element : Package_Element;
- Default_Switches_Array : Array_Element_Id;
+ Switches_Array : Array_Element_Id;
The_Switches : Prj.Variable_Value;
Current : Prj.String_List_Id;
The_String : String_Element;
+ Main : String_Access := null;
+ Main_Id : Name_Id;
+
begin
if Pkg /= No_Package then
- Element := Project_Tree.Packages.Table (Pkg);
- Default_Switches_Array :=
- Prj.Util.Value_Of
- (Name => Name_Default_Switches,
- In_Arrays => Element.Decl.Arrays,
- In_Tree => Project_Tree);
- The_Switches := Prj.Util.Value_Of
- (Index => Name_Ada,
- Src_Index => 0,
- In_Array => Default_Switches_Array,
- In_Tree => Project_Tree);
-
- -- If there are switches specified in the package of the
- -- project file corresponding to the tool, scan them.
+ -- First, check if there is a single main specified
+
+ for J in 1 .. Last_Switches.Last loop
+ if Last_Switches.Table (J) (1) /= '-' then
+ if Main = null then
+ Main := Last_Switches.Table (J);
+
+ else
+ Main := null;
+ exit;
+ end if;
+ end if;
+ end loop;
+
+ Element := Project_Tree.Shared.Packages.Table (Pkg);
+
+ -- If there is a single main and there is compilation
+ -- switches specified in the project file, use them.
+
+ if Main /= null and then not All_Projects then
+ Name_Len := Main'Length;
+ Name_Buffer (1 .. Name_Len) := Main.all;
+ Canonical_Case_File_Name (Name_Buffer (1 .. Name_Len));
+ Main_Id := Name_Find;
+
+ Switches_Array :=
+ Prj.Util.Value_Of
+ (Name => Name_Switches,
+ In_Arrays => Element.Decl.Arrays,
+ Shared => Project_Tree.Shared);
+ The_Switches := Prj.Util.Value_Of
+ (Index => Main_Id,
+ Src_Index => 0,
+ In_Array => Switches_Array,
+ Shared => Project_Tree.Shared);
+ end if;
+
+ -- Otherwise, get the Default_Switches ("Ada")
+
+ if The_Switches.Kind = Undefined then
+ Switches_Array :=
+ Prj.Util.Value_Of
+ (Name => Name_Default_Switches,
+ In_Arrays => Element.Decl.Arrays,
+ Shared => Project_Tree.Shared);
+ The_Switches := Prj.Util.Value_Of
+ (Index => Name_Ada,
+ Src_Index => 0,
+ In_Array => Switches_Array,
+ Shared => Project_Tree.Shared);
+ end if;
+
+ -- If there are switches specified, put them in the
+ -- Carg_Switches table.
case The_Switches.Kind is
when Prj.Undefined =>
when Prj.List =>
Current := The_Switches.Values;
while Current /= Prj.Nil_String loop
- The_String :=
- Project_Tree.String_Elements.Table (Current);
+ The_String := Project_Tree.Shared.String_Elements
+ .Table (Current);
declare
Switch : constant String :=
while K <= First_Switches.Last
and then
(The_Command /= Check
- or else First_Switches.Table (K).all /= "-rules")
+ or else First_Switches.Table (K).all /= "-rules")
loop
Add_To_Carg_Switches (First_Switches.Table (K));
K := K + 1;
while K <= Last_Switches.Last
and then
(The_Command /= Check
- or else
- Last_Switches.Table (K).all /= "-rules")
+ or else Last_Switches.Table (K).all /= "-rules")
loop
Add_To_Carg_Switches (Last_Switches.Table (K));
K := K + 1;
declare
CP_File : constant Path_Name_Type := Configuration_Pragmas_File;
+ M_File : constant Path_Name_Type := Mapping_File;
begin
if CP_File /= No_Path then
(new String'("-gnatec=" & Get_Name_String (CP_File)));
end if;
end if;
+
+ if M_File /= No_Path then
+ Add_To_Carg_Switches
+ (new String'("-gnatem=" & Get_Name_String (M_File)));
+ end if;
+
+ -- For gnatcheck, also indicate a global configuration pragmas
+ -- file and, if -U is not used, a local one.
+
+ if The_Command = Check then
+ declare
+ Pkg : constant Prj.Package_Id :=
+ Prj.Util.Value_Of
+ (Name => Name_Builder,
+ In_Packages => Project.Decl.Packages,
+ Shared => Project_Tree.Shared);
+
+ Variable : Variable_Value :=
+ Prj.Util.Value_Of
+ (Name => No_Name,
+ Attribute_Or_Array_Name =>
+ Name_Global_Configuration_Pragmas,
+ In_Package => Pkg,
+ Shared => Project_Tree.Shared);
+
+ begin
+ if (Variable = Nil_Variable_Value
+ or else Length_Of_Name (Variable.Value) = 0)
+ and then Pkg /= No_Package
+ then
+ Variable :=
+ Prj.Util.Value_Of
+ (Name => Name_Ada,
+ Attribute_Or_Array_Name =>
+ Name_Global_Config_File,
+ In_Package => Pkg,
+ Shared => Project_Tree.Shared);
+ end if;
+
+ if Variable /= Nil_Variable_Value
+ and then Length_Of_Name (Variable.Value) /= 0
+ then
+ Add_To_Carg_Switches
+ (new String'
+ ("-gnatec=" & Get_Name_String (Variable.Value)));
+ end if;
+ end;
+
+ if not All_Projects then
+ declare
+ Pkg : constant Prj.Package_Id :=
+ Prj.Util.Value_Of
+ (Name => Name_Compiler,
+ In_Packages => Project.Decl.Packages,
+ Shared => Project_Tree.Shared);
+
+ Variable : Variable_Value :=
+ Prj.Util.Value_Of
+ (Name => No_Name,
+ Attribute_Or_Array_Name =>
+ Name_Local_Configuration_Pragmas,
+ In_Package => Pkg,
+ Shared => Project_Tree.Shared);
+
+ begin
+ if (Variable = Nil_Variable_Value
+ or else Length_Of_Name (Variable.Value) = 0)
+ and then Pkg /= No_Package
+ then
+ Variable :=
+ Prj.Util.Value_Of
+ (Name => Name_Ada,
+ Attribute_Or_Array_Name =>
+ Name_Local_Config_File,
+ In_Package => Pkg,
+ Shared =>
+ Project_Tree.Shared);
+ end if;
+
+ if Variable /= Nil_Variable_Value
+ and then Length_Of_Name (Variable.Value) /= 0
+ then
+ Add_To_Carg_Switches
+ (new String'
+ ("-gnatec=" &
+ Get_Name_String (Variable.Value)));
+ end if;
+ end;
+ end if;
+ end if;
end;
end if;
Process_Link;
end if;
- if The_Command = Link or The_Command = Bind then
+ if The_Command = Link or else The_Command = Bind then
-- For files that are specified as relative paths with directory
-- information, we convert them to absolute paths, with parent
-- arguments.
for J in 1 .. Last_Switches.Last loop
- Test_If_Relative_Path
+ GNATCmd.Test_If_Relative_Path
(Last_Switches.Table (J), Current_Work_Dir);
end loop;
Project_Dir : constant String := Name_Buffer (1 .. Name_Len);
begin
for J in 1 .. First_Switches.Last loop
- Test_If_Relative_Path
+ GNATCmd.Test_If_Relative_Path
(First_Switches.Table (J), Project_Dir);
end loop;
end;
File_Index : Integer := 0;
Dir_Index : Integer := 0;
Last : constant Integer := Last_Switches.Last;
+ Lang : constant Language_Ptr :=
+ Get_Language_From_Name (Project, "ada");
begin
for Index in 1 .. Last loop
end if;
end loop;
- -- If the naming scheme of the project file is not standard,
- -- and if the file name ends with the spec suffix, then
- -- indicate to gnatstub the name of the body file with
- -- a -o switch.
+ -- If the project file naming scheme is not standard, and if
+ -- the file name ends with the spec suffix, then indicate to
+ -- gnatstub the name of the body file with a -o switch.
- if Body_Suffix_Id_Of (Project_Tree, Name_Ada, Project.Naming) /=
- Prj.Default_Ada_Spec_Suffix
- then
+ if not Is_Standard_GNAT_Naming (Lang.Config.Naming_Data) then
if File_Index /= 0 then
declare
Spec : constant String :=
- Base_Name (Last_Switches.Table (File_Index).all);
+ Base_Name
+ (Last_Switches.Table (File_Index).all);
Last : Natural := Spec'Last;
begin
- Get_Name_String
- (Spec_Suffix_Id_Of
- (Project_Tree, Name_Ada, Project.Naming));
+ Get_Name_String (Lang.Config.Naming_Data.Spec_Suffix);
if Spec'Length > Name_Len
and then Spec (Last - Name_Len + 1 .. Last) =
then
Last := Last - Name_Len;
Get_Name_String
- (Body_Suffix_Id_Of
- (Project_Tree, Name_Ada, Project.Naming));
+ (Lang.Config.Naming_Data.Body_Suffix);
Last_Switches.Increment_Last;
Last_Switches.Table (Last_Switches.Last) :=
new String'("-o");
end if;
-- For gnat check, -rules and the following switches need to be the
- -- last options. So, we move all these switches to table
- -- Rules_Switches.
+ -- last options, so move all these switches to table Rules_Switches.
if The_Command = Check then
declare
exception
when Error_Exit =>
if not Keep_Temporary_Files then
- Prj.Env.Delete_All_Path_Files (Project_Tree);
+ Prj.Delete_All_Temp_Files (Project_Tree.Shared);
Delete_Temp_Config_Files;
end if;
when Normal_Exit =>
if not Keep_Temporary_Files then
- Prj.Env.Delete_All_Path_Files (Project_Tree);
+ Prj.Delete_All_Temp_Files (Project_Tree.Shared);
Delete_Temp_Config_Files;
end if;
OSDN Git Service
