-- --
-- B o d y --
-- --
--- Copyright (C) 1996-2010, 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 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;
procedure GNATCmd is
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
-- 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 --
-----------------------
-- 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.
B_Start.all &
MLib.Fil.Ext_To
(Get_Name_String
- (Project_Tree.String_Elements.Table
+ (Project_Tree.Shared.String_Elements.Table
(Main).Value),
"ci"));
"b__" &
MLib.Fil.Ext_To
(Get_Name_String
- (Project_Tree.String_Elements.Table
- (Main).Value),
+ (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
while Proj /= null loop
if Proj.Project.Config_File_Temp then
Delete_Temporary_File
- (Project_Tree, Proj.Project.Config_File_Name);
+ (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_Temporary_File (Project_Tree, Temp_File_Name);
+ Delete_Temporary_File (Project_Tree.Shared, Temp_File_Name);
end if;
end Delete_Temp_Config_Files;
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
end if;
end loop;
- if not Keep_Temporary_Files then
- Delete (File);
- else
- Close (File);
- end if;
- end if;
- end Get_Closure;
-
- -----------
- -- Index --
- -----------
+ begin
+ if not Keep_Temporary_Files then
+ Delete (File);
+ else
+ Close (File);
+ end if;
- function Index (Char : Character; Str : String) return Natural is
- begin
- for Index in Str'Range loop
- if Str (Index) = Char then
- return Index;
- end if;
- end loop;
+ -- Don't crash if it is not possible to delete or close the file,
+ -- just ignore the situation.
- return 0;
- end Index;
+ exception
+ when others =>
+ null;
+ end;
+ end if;
+ end Get_Closure;
------------------
-- Mapping_File --
-- 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
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;
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
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);
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,
and then Argv (Argv'First + 1 .. Argv'First + 2) = "aP"
then
Prj.Env.Add_Directories
- (Project_Node_Tree.Project_Path,
+ (Root_Environment.Project_Path,
Argv (Argv'First + 3 .. Argv'Last));
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 (Project_Node_Tree,
- 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);
In_Tree => Project_Tree,
In_Node_Tree => Project_Node_Tree,
Project_File_Name => Project_File.all,
- Flags => Gnatmake_Flags,
+ 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");
end if;
Prj.Util.Value_Of
(Name => Tool_Package_Name,
In_Packages => Project.Decl.Packages,
- In_Tree => Project_Tree);
+ Shared => Project_Tree.Shared);
Element : Package_Element;
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),
Prj.Util.Value_Of
(Name => Name_Switches,
In_Arrays => Element.Decl.Arrays,
- In_Tree => Project_Tree);
+ 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,
- In_Tree => Project_Tree);
+ Shared => Project_Tree.Shared);
end if;
if The_Switches.Kind = Prj.Undefined then
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 => Switches_Array,
- In_Tree => Project_Tree);
+ 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
Prj.Util.Value_Of
(Name => Name_Compiler,
In_Packages => Project.Decl.Packages,
- In_Tree => Project_Tree);
+ Shared => Project_Tree.Shared);
Element : Package_Element;
begin
if Pkg /= No_Package then
- -- First, check if there is a single main specified.
+ -- First, check if there is a single main specified
for J in 1 .. Last_Switches.Last loop
if Last_Switches.Table (J) (1) /= '-' then
end if;
end loop;
- Element := Project_Tree.Packages.Table (Pkg);
+ 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.
Prj.Util.Value_Of
(Name => Name_Switches,
In_Arrays => Element.Decl.Arrays,
- In_Tree => Project_Tree);
+ Shared => Project_Tree.Shared);
The_Switches := Prj.Util.Value_Of
(Index => Main_Id,
Src_Index => 0,
In_Array => Switches_Array,
- In_Tree => Project_Tree);
+ Shared => Project_Tree.Shared);
end if;
-- Otherwise, get the Default_Switches ("Ada")
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 => Switches_Array,
- In_Tree => Project_Tree);
+ Shared => Project_Tree.Shared);
end if;
-- If there are switches specified, put them in the
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 :=
Prj.Util.Value_Of
(Name => Name_Builder,
In_Packages => Project.Decl.Packages,
- In_Tree => Project_Tree);
+ Shared => Project_Tree.Shared);
Variable : Variable_Value :=
Prj.Util.Value_Of
Attribute_Or_Array_Name =>
Name_Global_Configuration_Pragmas,
In_Package => Pkg,
- In_Tree => Project_Tree);
+ Shared => Project_Tree.Shared);
begin
if (Variable = Nil_Variable_Value
Attribute_Or_Array_Name =>
Name_Global_Config_File,
In_Package => Pkg,
- In_Tree => Project_Tree);
+ Shared => Project_Tree.Shared);
end if;
if Variable /= Nil_Variable_Value
Prj.Util.Value_Of
(Name => Name_Compiler,
In_Packages => Project.Decl.Packages,
- In_Tree => Project_Tree);
+ Shared => Project_Tree.Shared);
Variable : Variable_Value :=
Prj.Util.Value_Of
Attribute_Or_Array_Name =>
Name_Local_Configuration_Pragmas,
In_Package => Pkg,
- In_Tree => Project_Tree);
+ Shared => Project_Tree.Shared);
begin
if (Variable = Nil_Variable_Value
Attribute_Or_Array_Name =>
Name_Local_Config_File,
In_Package => Pkg,
- In_Tree => Project_Tree);
+ Shared =>
+ Project_Tree.Shared);
end if;
if Variable /= Nil_Variable_Value
exception
when Error_Exit =>
if not Keep_Temporary_Files then
- Prj.Delete_All_Temp_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.Delete_All_Temp_Files (Project_Tree);
+ Prj.Delete_All_Temp_Files (Project_Tree.Shared);
Delete_Temp_Config_Files;
end if;
OSDN Git Service
