-- --
-- B o d y --
-- --
--- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2007, 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- --
--- 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 Snames; use Snames;
with Switch; use Switch;
with Switch.M; use Switch.M;
-with Targparm;
+with Targparm; use Targparm;
+with Table;
with Tempdir;
+with Types; use Types;
with Ada.Exceptions; use Ada.Exceptions;
with Ada.Command_Line; use Ada.Command_Line;
with GNAT.Directory_Operations; use GNAT.Directory_Operations;
with GNAT.Case_Util; use GNAT.Case_Util;
+with GNAT.OS_Lib; use GNAT.OS_Lib;
with System.HTable;
-- Every program depends on this package, that must then be checked,
-- especially when -f and -a are used.
+ procedure Kill (Pid : Process_Id; Sig_Num : Integer; Close : Integer);
+ pragma Import (C, Kill, "__gnat_kill");
+ -- Called by Sigint_Intercepted to kill all spawned compilation processes
+
type Sigint_Handler is access procedure;
+ pragma Convention (C, Sigint_Handler);
procedure Install_Int_Handler (Handler : Sigint_Handler);
pragma Import (C, Install_Int_Handler, "__gnat_install_int_handler");
-- Called by Gnatmake to install the SIGINT handler below
procedure Sigint_Intercepted;
+ pragma Convention (C, Sigint_Intercepted);
-- Called when the program is interrupted by Ctrl-C to delete the
-- temporary mapping files and configuration pragmas files.
+ No_Mapping_File : constant Natural := 0;
+
+ type Compilation_Data is record
+ Pid : Process_Id;
+ Full_Source_File : File_Name_Type;
+ Lib_File : File_Name_Type;
+ Source_Unit : Unit_Name_Type;
+ Mapping_File : Natural := No_Mapping_File;
+ Project : Project_Id := No_Project;
+ Syntax_Only : Boolean := False;
+ Output_Is_Object : Boolean := True;
+ end record;
+ -- Data recorded for each compilation process spawned
+
+ type Comp_Data_Arr is array (Positive range <>) of Compilation_Data;
+ type Comp_Data_Ptr is access Comp_Data_Arr;
+ Running_Compile : Comp_Data_Ptr;
+ -- Used to save information about outstanding compilations
+
+ Outstanding_Compiles : Natural := 0;
+ -- Current number of outstanding compiles
+
-------------------------
-- Note on terminology --
-------------------------
- -- In this program, we use the phrase "termination" of a file name to
- -- refer to the suffix that appears after the unit name portion. Very
- -- often this is simply the extension, but in some cases, the sequence
- -- may be more complex, for example in main.1.ada, the termination in
- -- this name is ".1.ada" and in main_.ada the termination is "_.ada".
+ -- In this program, we use the phrase "termination" of a file name to refer
+ -- to the suffix that appears after the unit name portion. Very often this
+ -- is simply the extension, but in some cases, the sequence may be more
+ -- complex, for example in main.1.ada, the termination in this name is
+ -- ".1.ada" and in main_.ada the termination is "_.ada".
-------------------------------------
-- Queue (Q) Manipulation Routines --
-------------------------------------
- -- The Q is used in Compile_Sources below. Its implementation uses the
- -- GNAT generic package Table (basically an extensible array). Q_Front
- -- points to the first valid element in the Q, whereas Q.First is the first
- -- element ever enqueued, while Q.Last - 1 is the last element in the Q.
+ -- The Q is used in Compile_Sources below. Its implementation uses the GNAT
+ -- generic package Table (basically an extensible array). Q_Front points to
+ -- the first valid element in the Q, whereas Q.First is the first element
+ -- ever enqueued, while Q.Last - 1 is the last element in the Q.
--
-- +---+--------------+---+---+---+-----------+---+--------
-- Q | | ........ | | | | ....... | |
-- ^ ^ ^
-- Q.First Q_Front Q.Last - 1
--
- -- The elements comprised between Q.First and Q_Front - 1 are the
- -- elements that have been enqueued and then dequeued, while the
- -- elements between Q_Front and Q.Last - 1 are the elements currently
- -- in the Q. When the Q is initialized Q_Front = Q.First = Q.Last.
- -- After Compile_Sources has terminated its execution, Q_Front = Q.Last
- -- and the elements contained between Q.Front and Q.Last-1 are those that
- -- were explored and thus marked by Compile_Sources. Whenever the Q is
- -- reinitialized, the elements between Q.First and Q.Last - 1 are unmarked.
+ -- The elements comprised between Q.First and Q_Front - 1 are the elements
+ -- that have been enqueued and then dequeued, while the elements between
+ -- Q_Front and Q.Last - 1 are the elements currently in the Q. When the Q
+ -- is initialized Q_Front = Q.First = Q.Last. After Compile_Sources has
+ -- terminated its execution, Q_Front = Q.Last and the elements contained
+ -- between Q.Front and Q.Last-1 are those that were explored and thus
+ -- marked by Compile_Sources. Whenever the Q is reinitialized, the elements
+ -- between Q.First and Q.Last - 1 are unmarked.
procedure Init_Q;
-- Must be called to (re)initialize the Q
procedure Insert_Q
(Source_File : File_Name_Type;
- Source_Unit : Unit_Name_Type := No_Name;
+ Source_Unit : Unit_Name_Type := No_Unit_Name;
Index : Int := 0);
-- Inserts Source_File at the end of Q. Provide Source_Unit when possible
-- for external use (gnatdist). Provide index for multi-unit sources.
Table_Name => "Make.Q");
-- This is the actual Q
+ -- The 3 following packages are used to store gcc, gnatbind and gnatlink
+ -- switches found in the project files.
+
+ package Gcc_Switches is new Table.Table (
+ Table_Component_Type => String_Access,
+ Table_Index_Type => Integer,
+ Table_Low_Bound => 1,
+ Table_Initial => 20,
+ Table_Increment => 100,
+ Table_Name => "Make.Gcc_Switches");
+
+ package Binder_Switches is new Table.Table (
+ Table_Component_Type => String_Access,
+ Table_Index_Type => Integer,
+ Table_Low_Bound => 1,
+ Table_Initial => 20,
+ Table_Increment => 100,
+ Table_Name => "Make.Binder_Switches");
+
+ package Linker_Switches is new Table.Table (
+ Table_Component_Type => String_Access,
+ Table_Index_Type => Integer,
+ Table_Low_Bound => 1,
+ Table_Initial => 20,
+ Table_Increment => 100,
+ Table_Name => "Make.Linker_Switches");
+
-- The following instantiations and variables are necessary to save what
-- is found on the command line, in case there is a project file specified.
Table_Increment => 100,
Table_Name => "Make.Library_Projs");
- -- Two variables to keep the last binder and linker switch index
- -- in tables Binder_Switches and Linker_Switches, before adding
- -- switches from the project file (if any) and switches from the
- -- command line (if any).
+ -- Two variables to keep the last binder and linker switch index in tables
+ -- Binder_Switches and Linker_Switches, before adding switches from the
+ -- project file (if any) and switches from the command line (if any).
Last_Binder_Switch : Integer := 0;
Last_Linker_Switch : Integer := 0;
Main_Project : Prj.Project_Id := No_Project;
-- The project id of the main project file, if any
- Project_Object_Directory : Project_Id := No_Project;
- -- The object directory of the project for the last compilation.
- -- Avoid calling Change_Dir if the current working directory is already
- -- this directory
+ Project_Of_Current_Object_Directory : Project_Id := No_Project;
+ -- The object directory of the project for the last compilation. Avoid
+ -- calling Change_Dir if the current working directory is already this
+ -- directory
-- Packages of project files where unknown attributes are errors
Packages_To_Check_By_Gnatmake : constant String_List_Access :=
Gnatmake_Packages'Access;
+ procedure Add_Library_Search_Dir
+ (Path : String;
+ On_Command_Line : Boolean);
+ -- Call Add_Lib_Search_Dir with an absolute directory path. If Path is
+ -- relative path, when On_Command_Line is True, it is relative to the
+ -- current working directory. When On_Command_Line is False, it is relative
+ -- to the project directory of the main project.
+
+ procedure Add_Source_Search_Dir
+ (Path : String;
+ On_Command_Line : Boolean);
+ -- Call Add_Src_Search_Dir with an absolute directory path. If Path is a
+ -- relative path, when On_Command_Line is True, it is relative to the
+ -- current working directory. When On_Command_Line is False, it is relative
+ -- to the project directory of the main project.
+
procedure Add_Source_Dir (N : String);
- -- Call Add_Src_Search_Dir.
- -- Output one line when in verbose mode.
+ -- Call Add_Src_Search_Dir (output one line when in verbose mode)
procedure Add_Source_Directories is
new Prj.Env.For_All_Source_Dirs (Action => Add_Source_Dir);
procedure Add_Object_Dir (N : String);
- -- Call Add_Lib_Search_Dir.
- -- Output one line when in verbose mode.
+ -- Call Add_Lib_Search_Dir (output one line when in verbose mode)
procedure Add_Object_Directories is
new Prj.Env.For_All_Object_Dirs (Action => Add_Object_Dir);
Unit : Unit_Name_Type;
Found : Boolean;
end record;
- -- File is the name of the file for which a compilation failed.
- -- Unit is for gnatdist use in order to easily get the unit name
- -- of a file when its name is krunched or declared in gnat.adc.
- -- Found is False if the compilation failed because the file could
- -- not be found.
+ -- File is the name of the file for which a compilation failed. Unit is for
+ -- gnatdist use in order to easily get the unit name of a file when its
+ -- name is krunched or declared in gnat.adc. Found is False if the
+ -- compilation failed because the file could not be found.
package Bad_Compilation is new Table.Table (
Table_Component_Type => Bad_Compilation_Info,
Do_Compile_Step : Boolean := True;
Do_Bind_Step : Boolean := True;
Do_Link_Step : Boolean := True;
- -- Flags to indicate what step should be executed.
- -- Can be set to False with the switches -c, -b and -l.
- -- These flags are reset to True for each invokation of procedure Gnatmake.
+ -- Flags to indicate what step should be executed. Can be set to False
+ -- with the switches -c, -b and -l. These flags are reset to True for
+ -- each invocation of procedure Gnatmake.
Shared_String : aliased String := "-shared";
Force_Elab_Flags_String : aliased String := "-F";
type Header_Num is range 1 .. Max_Header;
-- Header_Num for the hash table Obsoleted below
- function Hash (F : Name_Id) return Header_Num;
+ function Hash (F : File_Name_Type) return Header_Num;
-- Hash function for the hash table Obsoleted below
package Obsoleted is new System.HTable.Simple_HTable
(Header_Num => Header_Num,
Element => Boolean,
No_Element => False,
- Key => Name_Id,
+ Key => File_Name_Type,
Hash => Hash,
Equal => "=");
-- A hash table to keep all files that have been compiled, to detect
-- if an executable is up to date or not.
- procedure Enter_Into_Obsoleted (F : Name_Id);
- -- Enter a file name, without directory information, into the has table
+ procedure Enter_Into_Obsoleted (F : File_Name_Type);
+ -- Enter a file name, without directory information, into the hash table
-- Obsoleted.
- function Is_In_Obsoleted (F : Name_Id) return Boolean;
+ function Is_In_Obsoleted (F : File_Name_Type) return Boolean;
-- Check if a file name, without directory information, has already been
-- entered into the hash table Obsoleted.
type Dependency is record
- This : Name_Id;
- Depends_On : Name_Id;
+ This : File_Name_Type;
+ Depends_On : File_Name_Type;
end record;
-- Components of table Dependencies below
Table_Increment => 100,
Table_Name => "Make.Dependencies");
-- A table to keep dependencies, to be able to decide if an executable
- -- is obsolete.
+ -- is obsolete. More explanation needed ???
- procedure Add_Dependency (S : Name_Id; On : Name_Id);
- -- Add one entry in table Dependencies
+-- procedure Add_Dependency (S : File_Name_Type; On : File_Name_Type);
+-- -- Add one entry in table Dependencies
----------------------------
-- Arguments and Switches --
Arguments_Project : Project_Id;
-- Project id, if any, of the source to be compiled
- Arguments_Path_Name : File_Name_Type;
+ Arguments_Path_Name : Path_Name_Type;
-- Full path of the source to be compiled, when Arguments_Project is not
-- No_Project.
-- no additional ALI files should be scanned between the two calls (i.e.
-- between the call to Compile_Sources and List_Depend.)
- procedure Inform (N : Name_Id := No_Name; Msg : String);
- -- Prints out the program name followed by a colon, N and S
-
procedure List_Bad_Compilations;
-- Prints out the list of all files for which the compilation failed
procedure Verbose_Msg
- (N1 : Name_Id;
- S1 : String;
- N2 : Name_Id := No_Name;
- S2 : String := "";
- Prefix : String := " -> ");
- -- If the verbose flag (Verbose_Mode) is set then print Prefix to standard
+ (N1 : Name_Id;
+ S1 : String;
+ N2 : Name_Id := No_Name;
+ S2 : String := "";
+ Prefix : String := " -> ";
+ Minimum_Verbosity : Verbosity_Level_Type := Opt.Low);
+ procedure Verbose_Msg
+ (N1 : File_Name_Type;
+ S1 : String;
+ N2 : File_Name_Type := No_File;
+ S2 : String := "";
+ Prefix : String := " -> ";
+ Minimum_Verbosity : Verbosity_Level_Type := Opt.Low);
+ -- If the verbose flag (Verbose_Mode) is set and the verbosity level is
+ -- at least equal to Minimum_Verbosity, then print Prefix to standard
-- output followed by N1 and S1. If N2 /= No_Name then N2 is printed after
-- S1. S2 is printed last. Both N1 and N2 are printed in quotation marks.
-- Set Usage_Needed to False.
procedure Debug_Msg (S : String; N : Name_Id);
+ procedure Debug_Msg (S : String; N : File_Name_Type);
+ procedure Debug_Msg (S : String; N : Unit_Name_Type);
-- If Debug.Debug_Flag_W is set outputs string S followed by name N
procedure Recursive_Compute_Depth
Depth : Natural);
-- Compute depth of Project and of the projects it depends on
+ procedure Compute_All_Imported_Projects (Project : Project_Id);
+ -- Compute, the list of the projects imported directly or indirectly by
+ -- project Project.
+
-----------------------
-- Gnatmake Routines --
-----------------------
Ada_Lib_Dir : constant Lib_Mark_Type := 1;
-- Used to mark a directory as a GNAT lib dir
- -- Note that the notion of GNAT lib dir is no longer used. The code
- -- related to it has not been removed to give an idea on how to use
- -- the directory prefix marking mechanism.
+ -- Note that the notion of GNAT lib dir is no longer used. The code related
+ -- to it has not been removed to give an idea on how to use the directory
+ -- prefix marking mechanism.
- -- An Ada library directory is a directory containing ali and object
- -- files but no source files for the bodies (the specs can be in the
- -- same or some other directory). These directories are specified
- -- in the Gnatmake command line with the switch "-Adir" (to specify the
- -- spec location -Idir cab be used). Gnatmake skips the missing sources
- -- whose ali are in Ada library directories. For an explanation of why
- -- Gnatmake behaves that way, see the spec of Make.Compile_Sources.
- -- The directory lookup penalty is incurred every single time this
- -- routine is called.
+ -- An Ada library directory is a directory containing ali and object files
+ -- but no source files for the bodies (the specs can be in the same or some
+ -- other directory). These directories are specified in the Gnatmake
+ -- command line with the switch "-Adir" (to specify the spec location -Idir
+ -- cab be used). Gnatmake skips the missing sources whose ali are in Ada
+ -- library directories. For an explanation of why Gnatmake behaves that
+ -- way, see the spec of Make.Compile_Sources. The directory lookup penalty
+ -- is incurred every single time this routine is called.
procedure Check_Steps;
-- Check what steps (Compile, Bind, Link) must be executed.
-- Set the step flags accordingly.
- function In_Ada_Lib_Dir (File : File_Name_Type) return Boolean;
+ function In_Ada_Lib_Dir (File : File_Name_Type) return Boolean;
-- Get directory prefix of this file and get lib mark stored in name
-- table for this directory. Then check if an Ada lib mark has been set.
procedure Mark_Directory
- (Dir : String;
- Mark : Lib_Mark_Type);
- -- Store Dir in name table and set lib mark as name info to identify
- -- Ada libraries.
+ (Dir : String;
+ Mark : Lib_Mark_Type;
+ On_Command_Line : Boolean);
+ -- Store the absolute path from Dir in name table and set lib mark as name
+ -- info to identify Ada libraries.
+ --
+ -- If Dir is a relative path, when On_Command_Line is True, it is relative
+ -- to the current working directory; when On_Command_Line is False, it is
+ -- relative to the project directory of the main project.
Output_Is_Object : Boolean := True;
-- Set to False when using a switch -S for the compiler
-- compiler.
function Switches_Of
- (Source_File : Name_Id;
+ (Source_File : File_Name_Type;
Source_File_Name : String;
Source_Index : Int;
Naming : Naming_Data;
In_Package : Package_Id;
Allow_ALI : Boolean) return Variable_Value;
- -- Return the switches for the source file in the specified package
- -- of a project file. If the Source_File ends with a standard GNAT
- -- extension (".ads" or ".adb"), try first the full name, then the
- -- name without the extension, then, if Allow_ALI is True, the name with
- -- the extension ".ali". If there is no switches for either names, try the
- -- default switches for Ada. If all failed, return No_Variable_Value.
+ -- Return the switches for the source file in the specified package of a
+ -- project file. If the Source_File ends with a standard GNAT extension
+ -- (".ads" or ".adb"), try first the full name, then the name without the
+ -- extension, then, if Allow_ALI is True, the name with the extension
+ -- ".ali". If there is no switches for either names, try the default
+ -- switches for Ada. If all failed, return No_Variable_Value.
function Is_In_Object_Directory
(Source_File : File_Name_Type;
GNAT_Flag : constant String_Access := new String'("-gnatpg");
Do_Not_Check_Flag : constant String_Access := new String'("-x");
- Object_Suffix : constant String := Get_Object_Suffix.all;
- Executable_Suffix : constant String := Get_Executable_Suffix.all;
+ Object_Suffix : constant String := Get_Target_Object_Suffix.all;
Syntax_Only : Boolean := False;
-- Set to True when compiling with -gnats
Display_Executed_Programs : Boolean := True;
- -- Set to True if name of commands should be output on stderr
+ -- Set to True if name of commands should be output on stderr (or on stdout
+ -- if the Commands_To_Stdout flag was set by use of the -S switch).
Output_File_Name_Seen : Boolean := False;
-- Set to True after having scanned the file_name for
And_Save : Boolean := True);
-- Make invokes one of three programs (the compiler, the binder or the
-- linker). For the sake of convenience, some program specific switches
- -- can be passed directly on the gnatmake commande line. This procedure
- -- records these switches so that gnamake can pass them to the right
+ -- can be passed directly on the gnatmake command line. This procedure
+ -- records these switches so that gnatmake can pass them to the right
-- program. S is the switch to be added at the end of the command line
-- for Program if Append_Switch is True. If Append_Switch is False S is
-- added at the beginning of the command line.
procedure Check
- (Source_File : File_Name_Type;
- Source_Index : Int;
- The_Args : Argument_List;
- Lib_File : File_Name_Type;
- Read_Only : Boolean;
- ALI : out ALI_Id;
- O_File : out File_Name_Type;
- O_Stamp : out Time_Stamp_Type);
+ (Source_File : File_Name_Type;
+ Source_Index : Int;
+ Is_Main_Source : Boolean;
+ The_Args : Argument_List;
+ Lib_File : File_Name_Type;
+ Read_Only : Boolean;
+ ALI : out ALI_Id;
+ O_File : out File_Name_Type;
+ O_Stamp : out Time_Stamp_Type);
-- Determines whether the library file Lib_File is up-to-date or not. The
-- full name (with path information) of the object file corresponding to
-- Lib_File is returned in O_File. Its time stamp is saved in O_Stamp.
-- Otherwise O_File is No_File.
procedure Collect_Arguments
- (Source_File : File_Name_Type;
- Source_Index : Int;
- Args : Argument_List);
+ (Source_File : File_Name_Type;
+ Source_Index : Int;
+ Is_Main_Source : Boolean;
+ Args : Argument_List);
-- Collect all arguments for a source to be compiled, including those
-- that come from a project file.
-- Displays Program followed by the arguments in Args if variable
-- Display_Executed_Programs is set. The lower bound of Args must be 1.
+ procedure Report_Compilation_Failed;
+ -- Delete all temporary files and fail graciously
+
-----------------
-- Mapping files
-----------------
- type Temp_File_Names is
- array (Project_Id range <>, Positive range <>) of Name_Id;
+ type Temp_Path_Names is
+ array (Project_Id range <>, Positive range <>) of Path_Name_Type;
- type Temp_Files_Ptr is access Temp_File_Names;
+ type Temp_Path_Ptr is access Temp_Path_Names;
type Indices is array (Project_Id range <>) of Natural;
type Free_Indices_Ptr is access Free_File_Indices;
- The_Mapping_File_Names : Temp_Files_Ptr;
+ The_Mapping_File_Names : Temp_Path_Ptr;
-- For each project, the name ids of the temporary mapping files used
Last_Mapping_File_Names : Indices_Ptr;
procedure Delete_All_Temp_Files;
-- Delete all temp files (config files, mapping files, path files)
+ -------------------------------------------------
+ -- Subprogram declarations moved from the spec --
+ -------------------------------------------------
+
+ procedure Bind (ALI_File : File_Name_Type; Args : Argument_List);
+ -- Binds ALI_File. Args are the arguments to pass to the binder.
+ -- Args must have a lower bound of 1.
+
+ procedure Display_Commands (Display : Boolean := True);
+ -- The default behavior of Make commands (Compile_Sources, Bind, Link)
+ -- is to display them on stderr. This behavior can be changed repeatedly
+ -- by invoking this procedure.
+
+ -- If a compilation, bind or link failed one of the following 3 exceptions
+ -- is raised. These need to be handled by the calling routines.
+
+ procedure Compile_Sources
+ (Main_Source : File_Name_Type;
+ Args : Argument_List;
+ First_Compiled_File : out File_Name_Type;
+ Most_Recent_Obj_File : out File_Name_Type;
+ Most_Recent_Obj_Stamp : out Time_Stamp_Type;
+ Main_Unit : out Boolean;
+ Compilation_Failures : out Natural;
+ Main_Index : Int := 0;
+ Check_Readonly_Files : Boolean := False;
+ Do_Not_Execute : Boolean := False;
+ Force_Compilations : Boolean := False;
+ Keep_Going : Boolean := False;
+ In_Place_Mode : Boolean := False;
+ Initialize_ALI_Data : Boolean := True;
+ Max_Process : Positive := 1);
+ -- Compile_Sources will recursively compile all the sources needed by
+ -- Main_Source. Before calling this routine make sure Namet has been
+ -- initialized. This routine can be called repeatedly with different
+ -- Main_Source file as long as all the source (-I flags), library
+ -- (-B flags) and ada library (-A flags) search paths between calls are
+ -- *exactly* the same. The default directory must also be the same.
+ --
+ -- Args contains the arguments to use during the compilations.
+ -- The lower bound of Args must be 1.
+ --
+ -- First_Compiled_File is set to the name of the first file that is
+ -- compiled or that needs to be compiled. This is set to No_Name if no
+ -- compilations were needed.
+ --
+ -- Most_Recent_Obj_File is set to the full name of the most recent
+ -- object file found when no compilations are needed, that is when
+ -- First_Compiled_File is set to No_Name. When First_Compiled_File
+ -- is set then Most_Recent_Obj_File is set to No_Name.
+ --
+ -- Most_Recent_Obj_Stamp is the time stamp of Most_Recent_Obj_File.
+ --
+ -- Main_Unit is set to True if Main_Source can be a main unit.
+ -- If Do_Not_Execute is False and First_Compiled_File /= No_Name
+ -- the value of Main_Unit is always False.
+ -- Is this used any more??? It is certainly not used by gnatmake???
+ --
+ -- Compilation_Failures is a count of compilation failures. This count
+ -- is used to extract compilation failure reports with Extract_Failure.
+ --
+ -- Main_Index, when not zero, is the index of the main unit in source
+ -- file Main_Source which is a multi-unit source.
+ -- Zero indicates that Main_Source is a single unit source file.
+ --
+ -- Check_Readonly_Files set it to True to compile source files
+ -- which library files are read-only. When compiling GNAT predefined
+ -- files the "-gnatg" flag is used.
+ --
+ -- Do_Not_Execute set it to True to find out the first source that
+ -- needs to be recompiled, but without recompiling it. This file is
+ -- saved in First_Compiled_File.
+ --
+ -- Force_Compilations forces all compilations no matter what but
+ -- recompiles read-only files only if Check_Readonly_Files
+ -- is set.
+ --
+ -- Keep_Going when True keep compiling even in the presence of
+ -- compilation errors.
+ --
+ -- In_Place_Mode when True save library/object files in their object
+ -- directory if they already exist; otherwise, in the source directory.
+ --
+ -- Initialize_ALI_Data set it to True when you want to initialize ALI
+ -- data-structures. This is what you should do most of the time.
+ -- (especially the first time around when you call this routine).
+ -- This parameter is set to False to preserve previously recorded
+ -- ALI file data.
+ --
+ -- Max_Process is the maximum number of processes that should be spawned
+ -- to carry out compilations.
+ --
+ -- Flags in Package Opt Affecting Compile_Sources
+ -- -----------------------------------------------
+ --
+ -- Check_Object_Consistency set it to False to omit all consistency
+ -- checks between an .ali file and its corresponding object file.
+ -- When this flag is set to true, every time an .ali is read,
+ -- package Osint checks that the corresponding object file
+ -- exists and is more recent than the .ali.
+ --
+ -- Use of Name Table Info
+ -- ----------------------
+ --
+ -- All file names manipulated by Compile_Sources are entered into the
+ -- Names table. The Byte field of a source file is used to mark it.
+ --
+ -- Calling Compile_Sources Several Times
+ -- -------------------------------------
+ --
+ -- Upon return from Compile_Sources all the ALI data structures are left
+ -- intact for further browsing. HOWEVER upon entry to this routine ALI
+ -- data structures are re-initialized if parameter Initialize_ALI_Data
+ -- above is set to true. Typically this is what you want the first time
+ -- you call Compile_Sources. You should not load an ali file, call this
+ -- routine with flag Initialize_ALI_Data set to True and then expect
+ -- that ALI information to be around after the call. Note that the first
+ -- time you call Compile_Sources you better set Initialize_ALI_Data to
+ -- True unless you have called Initialize_ALI yourself.
+ --
+ -- Compile_Sources ALGORITHM : Compile_Sources (Main_Source)
+ -- -------------------------
+ --
+ -- 1. Insert Main_Source in a Queue (Q) and mark it.
+ --
+ -- 2. Let unit.adb be the file at the head of the Q. If unit.adb is
+ -- missing but its corresponding ali file is in an Ada library directory
+ -- (see below) then, remove unit.adb from the Q and goto step 4.
+ -- Otherwise, look at the files under the D (dependency) section of
+ -- unit.ali. If unit.ali does not exist or some of the time stamps do
+ -- not match, (re)compile unit.adb.
+ --
+ -- An Ada library directory is a directory containing Ada specs, ali
+ -- and object files but no source files for the bodies. An Ada library
+ -- directory is communicated to gnatmake by means of some switch so that
+ -- gnatmake can skip the sources whole ali are in that directory.
+ -- There are two reasons for skipping the sources in this case. Firstly,
+ -- Ada libraries typically come without full sources but binding and
+ -- linking against those libraries is still possible. Secondly, it would
+ -- be very wasteful for gnatmake to systematically check the consistency
+ -- of every external Ada library used in a program. The binder is
+ -- already in charge of catching any potential inconsistencies.
+ --
+ -- 3. Look into the W section of unit.ali and insert into the Q all
+ -- unmarked source files. Mark all files newly inserted in the Q.
+ -- Specifically, assuming that the W section looks like
+ --
+ -- W types%s types.adb types.ali
+ -- W unchecked_deallocation%s
+ -- W xref_tab%s xref_tab.adb xref_tab.ali
+ --
+ -- Then xref_tab.adb and types.adb are inserted in the Q if they are not
+ -- already marked.
+ -- Note that there is no file listed under W unchecked_deallocation%s
+ -- so no generic body should ever be explicitly compiled (unless the
+ -- Main_Source at the start was a generic body).
+ --
+ -- 4. Repeat steps 2 and 3 above until the Q is empty
+ --
+ -- Note that the above algorithm works because the units withed in
+ -- subunits are transitively included in the W section (with section) of
+ -- the main unit. Likewise the withed units in a generic body needed
+ -- during a compilation are also transitively included in the W section
+ -- of the originally compiled file.
+
+ procedure Initialize;
+ -- Performs default and package initialization. Therefore,
+ -- Compile_Sources can be called by an external unit.
+
+ procedure Link
+ (ALI_File : File_Name_Type;
+ Args : Argument_List;
+ Success : out Boolean);
+ -- Links ALI_File. Args are the arguments to pass to the linker.
+ -- Args must have a lower bound of 1. Success indicates if the link
+ -- succeeded or not.
+
+ procedure Scan_Make_Arg (Argv : String; And_Save : Boolean);
+ -- Scan make arguments. Argv is a single argument to be processed
+
-------------------
-- Add_Arguments --
-------------------
Last_Argument := Last_Argument + Args'Length;
end Add_Arguments;
- --------------------
- -- Add_Dependency --
- --------------------
+-- --------------------
+-- -- Add_Dependency --
+-- --------------------
+--
+-- procedure Add_Dependency (S : File_Name_Type; On : File_Name_Type) is
+-- begin
+-- Dependencies.Increment_Last;
+-- Dependencies.Table (Dependencies.Last) := (S, On);
+-- end Add_Dependency;
- procedure Add_Dependency (S : Name_Id; On : Name_Id) is
+ ----------------------------
+ -- Add_Library_Search_Dir --
+ ----------------------------
+
+ procedure Add_Library_Search_Dir
+ (Path : String;
+ On_Command_Line : Boolean)
+ is
begin
- Dependencies.Increment_Last;
- Dependencies.Table (Dependencies.Last) := (S, On);
- end Add_Dependency;
+ if On_Command_Line then
+ Add_Lib_Search_Dir (Normalize_Pathname (Path));
+
+ else
+ Get_Name_String
+ (Project_Tree.Projects.Table (Main_Project).Display_Directory);
+ Add_Lib_Search_Dir
+ (Normalize_Pathname (Path, Name_Buffer (1 .. Name_Len)));
+ end if;
+ end Add_Library_Search_Dir;
--------------------
-- Add_Object_Dir --
end if;
end Add_Source_Dir;
+ ---------------------------
+ -- Add_Source_Search_Dir --
+ ---------------------------
+
+ procedure Add_Source_Search_Dir
+ (Path : String;
+ On_Command_Line : Boolean)
+ is
+ begin
+ if On_Command_Line then
+ Add_Src_Search_Dir (Normalize_Pathname (Path));
+
+ else
+ Get_Name_String
+ (Project_Tree.Projects.Table (Main_Project).Display_Directory);
+ Add_Src_Search_Dir
+ (Normalize_Pathname (Path, Name_Buffer (1 .. Name_Len)));
+ end if;
+ end Add_Source_Search_Dir;
+
----------------
-- Add_Switch --
----------------
-- Generic_Position --
----------------------
- procedure Generic_Position (New_Position : out Integer) is
+ procedure Generic_Position (New_Position : out Integer) is
begin
T.Increment_Last;
Switch_List := Switches.Values;
while Switch_List /= Nil_String loop
- Element :=
- Project_Tree.String_Elements.Table (Switch_List);
+ Element := Project_Tree.String_Elements.Table (Switch_List);
Get_Name_String (Element.Value);
if Name_Len > 0 then
declare
Argv : constant String := Name_Buffer (1 .. Name_Len);
- -- We need a copy, because Name_Buffer may be
- -- modified.
+ -- We need a copy, because Name_Buffer may be modified
begin
if Verbose_Mode then
Bind_Args (Args'Range) := Args;
end if;
- -- It is completely pointless to re-check source file time stamps.
- -- This has been done already by gnatmake
+ -- It is completely pointless to re-check source file time stamps. This
+ -- has been done already by gnatmake
Bind_Last := Bind_Last + 1;
Bind_Args (Bind_Last) := Do_Not_Check_Flag;
(Gnatbind_Path.all, Bind_Args (Args'First .. Bind_Last), Success);
if not Success then
- raise Bind_Failed;
+ Make_Failed ("*** bind failed.");
end if;
end Bind;
--------------------------------
procedure Change_To_Object_Directory (Project : Project_Id) is
- Actual_Project : Project_Id;
+ Actual_Project : Project_Id;
+ Object_Directory : Path_Name_Type;
begin
-- For sources outside of any project, compilation occurs in the object
-- Nothing to do if the current working directory is already the correct
-- object directory.
- if Project_Object_Directory /= Actual_Project then
- Project_Object_Directory := Actual_Project;
+ if Project_Of_Current_Object_Directory /= Actual_Project then
+ Project_Of_Current_Object_Directory := Actual_Project;
+ Object_Directory :=
+ Project_Tree.Projects.Table (Actual_Project).Object_Directory;
-- Set the working directory to the object directory of the actual
-- project.
- Change_Dir
- (Get_Name_String
- (Project_Tree.Projects.Table
- (Actual_Project).Object_Directory));
+ if Verbose_Mode then
+ Write_Str ("Changing to object directory of """);
+ Write_Name
+ (Project_Tree.Projects.Table (Actual_Project).Display_Name);
+ Write_Str (""": """);
+ Write_Name (Object_Directory);
+ Write_Line ("""");
+ end if;
+ Change_Dir (Get_Name_String (Object_Directory));
end if;
exception
-- Fail if unable to change to the object directory
when Directory_Error =>
- Make_Failed ("unable to change to object directory of project " &
+ Make_Failed ("unable to change to object directory """ &
+ Get_Name_String
+ (Project_Tree.Projects.Table
+ (Actual_Project).Object_Directory) &
+ """ of project " &
Get_Name_String (Project_Tree.Projects.Table
(Actual_Project).Display_Name));
end Change_To_Object_Directory;
-----------
procedure Check
- (Source_File : File_Name_Type;
- Source_Index : Int;
- The_Args : Argument_List;
- Lib_File : File_Name_Type;
- Read_Only : Boolean;
- ALI : out ALI_Id;
- O_File : out File_Name_Type;
- O_Stamp : out Time_Stamp_Type)
+ (Source_File : File_Name_Type;
+ Source_Index : Int;
+ Is_Main_Source : Boolean;
+ The_Args : Argument_List;
+ Lib_File : File_Name_Type;
+ Read_Only : Boolean;
+ ALI : out ALI_Id;
+ O_File : out File_Name_Type;
+ O_Stamp : out Time_Stamp_Type)
is
function First_New_Spec (A : ALI_Id) return File_Name_Type;
-- Looks in the with table entries of A and returns the spec file name
Spec_File_Name : File_Name_Type := No_File;
function New_Spec (Uname : Unit_Name_Type) return Boolean;
- -- Uname is the name of the spec or body of some ada unit.
- -- This function returns True if the Uname is the name of a body
- -- which has a spec not mentioned inali file A. If True is returned
+ -- Uname is the name of the spec or body of some ada unit. This
+ -- function returns True if the Uname is the name of a body which has
+ -- a spec not mentioned in ALI file A. If True is returned
-- Spec_File_Name above is set to the name of this spec file.
--------------
File_Name : File_Name_Type;
begin
- -- Test whether Uname is the name of a body unit (ie ends with %b)
+ -- Test whether Uname is the name of a body unit (i.e. ends
+ -- with %b)
Get_Name_String (Uname);
pragma
-- appear in the Sdep section of Lib_File, New_Spec contains the file
-- name of this new spec.
- Source_Name : Name_Id;
+ Source_Name : File_Name_Type;
Text : Text_Buffer_Ptr;
Prev_Switch : String_Access;
Switch_Found : Boolean;
-- True if a given switch has been found
+ ALI_Project : Project_Id;
+ -- If the ALI file is in the object directory of a project, this is
+ -- the project id.
+
-- Start of processing for Check
begin
pragma Assert (Lib_File /= No_File);
- -- If the ALI file is read-only, set temporarily
- -- Check_Object_Consistency to False: we don't care if the object file
- -- is not there; presumably, a library will be used for linking.
+ -- If ALI file is read-only, temporarily set Check_Object_Consistency to
+ -- False. We don't care if the object file is not there (presumably a
+ -- library will be used for linking.)
if Read_Only then
declare
Obj_Stamp := Current_Object_File_Stamp;
if Full_Lib_File = No_File then
- Verbose_Msg (Lib_File, "being checked ...", Prefix => " ");
+ Verbose_Msg
+ (Lib_File,
+ "being checked ...",
+ Prefix => " ",
+ Minimum_Verbosity => Opt.Medium);
else
- Verbose_Msg (Full_Lib_File, "being checked ...", Prefix => " ");
+ Verbose_Msg
+ (Full_Lib_File,
+ "being checked ...",
+ Prefix => " ",
+ Minimum_Verbosity => Opt.Medium);
end if;
ALI := No_ALI_Id;
-- First, collect all the switches
- Collect_Arguments (Source_File, Source_Index, The_Args);
+ Collect_Arguments
+ (Source_File, Source_Index, Is_Main_Source, The_Args);
Prev_Switch := Dummy_Switch;
for J in 1 .. Switches_To_Check.Last loop
- -- Comparing switches is delicate because gcc reorders
- -- a number of switches, according to lang-specs.h, but
- -- gnatmake doesn't have the sufficient knowledge to
- -- perform the same reordering. Instead, we ignore orders
- -- between different "first letter" switches, but keep
- -- orders between same switches, e.g -O -O2 is different
- -- than -O2 -O, but -g -O is equivalent to -O -g.
+ -- Comparing switches is delicate because gcc reorders a number
+ -- of switches, according to lang-specs.h, but gnatmake doesn't
+ -- have sufficient knowledge to perform the same reordering.
+ -- Instead, we ignore orders between different "first letter"
+ -- switches, but keep orders between same switches, e.g -O -O2
+ -- is different than -O2 -O, but -g -O is equivalent to -O -g.
if Switches_To_Check.Table (J) (2) /= Prev_Switch (2) or else
(Prev_Switch'Length >= 6 and then
Verbose_Msg (New_Spec, "old spec missing");
end if;
end if;
+
+ elsif Main_Project /= No_Project then
+
+ -- Check if a file name does not correspond to the mapping of
+ -- units to file names.
+
+ declare
+ WR : With_Record;
+ Unit_Name : Name_Id;
+ UID : Prj.Unit_Index;
+ U_Data : Unit_Data;
+
+ begin
+ U_Chk :
+ for U in ALIs.Table (ALI).First_Unit ..
+ ALIs.Table (ALI).Last_Unit
+ loop
+ W_Check :
+ for W in Units.Table (U).First_With
+ ..
+ Units.Table (U).Last_With
+ loop
+ WR := Withs.Table (W);
+
+ if WR.Sfile /= No_File then
+ Get_Name_String (WR.Uname);
+ Name_Len := Name_Len - 2;
+ Unit_Name := Name_Find;
+
+ UID := Units_Htable.Get
+ (Project_Tree.Units_HT, Unit_Name);
+
+ if UID /= Prj.No_Unit_Index then
+ U_Data := Project_Tree.Units.Table (UID);
+
+ if U_Data.File_Names (Body_Part).Name /= WR.Sfile
+ and then
+ U_Data.File_Names (Specification).Name /=
+ WR.Sfile
+ then
+ ALI := No_ALI_Id;
+
+ Verbose_Msg
+ (Unit_Name, " sources does not include ",
+ Name_Id (WR.Sfile));
+
+ return;
+ end if;
+ end if;
+ end if;
+ end loop W_Check;
+ end loop U_Chk;
+ end;
+
+ -- Check that the ALI file is in the correct object directory.
+ -- If it is in the object directory of a project that is
+ -- extended and it depends on a source that is in one of its
+ -- extending projects, then the ALI file is not in the correct
+ -- object directory.
+
+ -- First, find the project of this ALI file. As there may be
+ -- several projects with the same object directory, we first
+ -- need to find the project of the source.
+
+ ALI_Project := No_Project;
+
+ declare
+ Udata : Prj.Unit_Data;
+
+ begin
+ for U in 1 .. Unit_Table.Last (Project_Tree.Units) loop
+ Udata := Project_Tree.Units.Table (U);
+
+ if Udata.File_Names (Body_Part).Name = Source_File then
+ ALI_Project := Udata.File_Names (Body_Part).Project;
+ exit;
+
+ elsif
+ Udata.File_Names (Specification).Name = Source_File
+ then
+ ALI_Project :=
+ Udata.File_Names (Specification).Project;
+ exit;
+ end if;
+ end loop;
+ end;
+
+ if ALI_Project = No_Project then
+ return;
+ end if;
+
+ declare
+ Obj_Dir : Path_Name_Type;
+ Res_Obj_Dir : constant String :=
+ Normalize_Pathname
+ (Dir_Name
+ (Get_Name_String (Full_Lib_File)),
+ Resolve_Links => True,
+ Case_Sensitive => False);
+
+ begin
+ Name_Len := 0;
+ Add_Str_To_Name_Buffer (Res_Obj_Dir);
+
+ if Name_Len > 1 and then
+ (Name_Buffer (Name_Len) = '/' or else
+ Name_Buffer (Name_Len) = Directory_Separator)
+ then
+ Name_Len := Name_Len - 1;
+ end if;
+
+ Obj_Dir := Name_Find;
+
+ while ALI_Project /= No_Project and then
+ Obj_Dir /=
+ Project_Tree.Projects.Table
+ (ALI_Project).Object_Directory
+ loop
+ ALI_Project :=
+ Project_Tree.Projects.Table (ALI_Project).Extended_By;
+ end loop;
+ end;
+
+ if ALI_Project = No_Project then
+ ALI := No_ALI_Id;
+
+ Verbose_Msg
+ (Lib_File, " wrong object directory");
+ return;
+ end if;
+
+ -- If the ALI project is not extended, then it must be in
+ -- the correct object directory.
+
+ if Project_Tree.Projects.Table (ALI_Project).Extended_By =
+ No_Project
+ then
+ return;
+ end if;
+
+ -- Count the extending projects
+
+ declare
+ Num_Ext : Natural;
+ Proj : Project_Id;
+
+ begin
+ Num_Ext := 0;
+ Proj := ALI_Project;
+ loop
+ Proj := Project_Tree.Projects.Table (Proj).Extended_By;
+ exit when Proj = No_Project;
+ Num_Ext := Num_Ext + 1;
+ end loop;
+
+ -- Make a list of the extending projects
+
+ declare
+ Projects : array (1 .. Num_Ext) of Project_Id;
+ Dep : Sdep_Record;
+ OK : Boolean := True;
+
+ begin
+ Proj := ALI_Project;
+ for J in Projects'Range loop
+ Proj := Project_Tree.Projects.Table (Proj).Extended_By;
+ Projects (J) := Proj;
+ end loop;
+
+ -- Now check if any of the dependant sources are in
+ -- any of these extending projects.
+
+ D_Chk :
+ for D in ALIs.Table (ALI).First_Sdep ..
+ ALIs.Table (ALI).Last_Sdep
+ loop
+ Dep := Sdep.Table (D);
+
+ Proj := No_Project;
+
+ Unit_Loop :
+ for
+ UID in 1 .. Unit_Table.Last (Project_Tree.Units)
+ loop
+ if Project_Tree.Units.Table (UID).
+ File_Names (Body_Part).Name = Dep.Sfile
+ then
+ Proj := Project_Tree.Units.Table (UID).
+ File_Names (Body_Part).Project;
+
+ elsif Project_Tree.Units.Table (UID).
+ File_Names (Specification).Name = Dep.Sfile
+ then
+ Proj := Project_Tree.Units.Table (UID).
+ File_Names (Specification).Project;
+ end if;
+
+ -- If a source is in a project, check if it is one
+ -- in the list.
+
+ if Proj /= No_Project then
+ for J in Projects'Range loop
+ if Proj = Projects (J) then
+ OK := False;
+ exit D_Chk;
+ end if;
+ end loop;
+
+ exit Unit_Loop;
+ end if;
+ end loop Unit_Loop;
+ end loop D_Chk;
+
+ -- If one of the dependent sources is in one project of
+ -- the list, then we must recompile.
+
+ if not OK then
+ ALI := No_ALI_Id;
+ Verbose_Msg (Lib_File, " wrong object directory");
+ end if;
+ end;
+ end;
end if;
end if;
end if;
Name_Len := Name_Len - 1;
end loop;
- if Name_Len <= 0 then
+ if Name_Len = 0 then
return;
elsif Name_Buffer (1) = '-' then
-- Process linker options from the ALI files
for Opt in 1 .. Linker_Options.Last loop
- Check_File (Linker_Options.Table (Opt).Name);
+ Check_File (File_Name_Type (Linker_Options.Table (Opt).Name));
end loop;
-- Process options given on the command line
-----------------------
procedure Collect_Arguments
- (Source_File : File_Name_Type;
- Source_Index : Int;
- Args : Argument_List)
+ (Source_File : File_Name_Type;
+ Source_Index : Int;
+ Is_Main_Source : Boolean;
+ Args : Argument_List)
is
begin
Arguments_Collected := True;
Path => Arguments_Path_Name,
In_Tree => Project_Tree);
- -- If the source is not a source of a project file, check if
- -- this is allowed.
+ -- If the source is not a source of a project file, add the
+ -- recorded arguments. Check will be done later if the source
+ -- need to be compiled that the switch -x has been used.
if Arguments_Project = No_Project then
- if not External_Unit_Compilation_Allowed then
- Make_Failed ("external source (", Source_File_Name,
- ") is not part of any project; cannot be " &
- "compiled without gnatmake switch -x");
- end if;
-
- -- If it is allowed, simply add the saved gcc switches
-
Add_Arguments (The_Saved_Gcc_Switches.all);
- else
+ elsif not Project_Tree.Projects.Table
+ (Arguments_Project).Externally_Built
+ then
-- We get the project directory for the relative path
-- switches and arguments.
while Data.Extended_By /= No_Project loop
Arguments_Project := Data.Extended_By;
- Data :=
- Project_Tree.Projects.Table (Arguments_Project);
+ Data := Project_Tree.Projects.Table (Arguments_Project);
end loop;
-- If building a dynamic or relocatable library, compile with
Data;
end if;
- -- We now look for package Compiler
- -- and get the switches from this package.
+ -- We now look for package Compiler and get the switches from
+ -- this package.
Compiler_Package :=
Prj.Util.Value_Of
if Compiler_Package /= No_Package then
- -- If package Gnatmake.Compiler exists, we get
- -- the specific switches for the current source,
- -- or the global switches, if any.
+ -- If package Gnatmake.Compiler exists, we get the specific
+ -- switches for the current source, or the global switches,
+ -- if any.
- Switches := Switches_Of
- (Source_File => Source_File,
- Source_File_Name => Source_File_Name,
- Source_Index => Source_Index,
- Naming => Data.Naming,
- In_Package => Compiler_Package,
- Allow_ALI => False);
+ Switches :=
+ Switches_Of
+ (Source_File => Source_File,
+ Source_File_Name => Source_File_Name,
+ Source_Index => Source_Index,
+ Naming => Data.Naming,
+ In_Package => Compiler_Package,
+ Allow_ALI => False);
end if;
new String'(Name_Buffer (1 .. Name_Len));
Test_If_Relative_Path
(New_Args (Last_New),
- Parent => Data.Dir_Path);
+ Parent => Data.Dir_Path,
+ Including_Non_Switch => False);
end if;
Current := Element.Next;
begin
Test_If_Relative_Path
- (New_Args (1), Parent => Data.Dir_Path);
+ (New_Args (1),
+ Parent => Data.Dir_Path,
+ Including_Non_Switch => False);
Add_Arguments
(Configuration_Pragmas_Switch (Arguments_Project) &
New_Args & The_Saved_Gcc_Switches.all);
end;
end if;
+ -- For VMS, when compiling the main source, add switch
+ -- -mdebug-main=_ada_ so that the executable can be debugged
+ -- by the standard VMS debugger.
+
+ if not No_Main_Subprogram
+ and then Targparm.OpenVMS_On_Target
+ and then Is_Main_Source
+ then
+ -- First, check if compilation will be invoked with -g
+
+ for J in 1 .. Last_Argument loop
+ if Arguments (J)'Length >= 2
+ and then Arguments (J) (1 .. 2) = "-g"
+ and then (Arguments (J)'Length < 5
+ or else Arguments (J) (1 .. 5) /= "-gnat")
+ then
+ Add_Arguments
+ ((1 => new String'("-mdebug-main=_ada_")));
+ exit;
+ end if;
+ end loop;
+ end if;
+
-- Set Output_Is_Object, depending if there is a -S switch.
-- If the bind step is not performed, and there is a -S switch,
-- then we will not check for a valid object file.
procedure Compile_Sources
(Main_Source : File_Name_Type;
Args : Argument_List;
- First_Compiled_File : out Name_Id;
- Most_Recent_Obj_File : out Name_Id;
+ First_Compiled_File : out File_Name_Type;
+ Most_Recent_Obj_File : out File_Name_Type;
Most_Recent_Obj_Stamp : out Time_Stamp_Type;
Main_Unit : out Boolean;
Compilation_Failures : out Natural;
Initialize_ALI_Data : Boolean := True;
Max_Process : Positive := 1)
is
- No_Mapping_File : constant Natural := 0;
-
- type Compilation_Data is record
- Pid : Process_Id;
- Full_Source_File : File_Name_Type;
- Lib_File : File_Name_Type;
- Source_Unit : Unit_Name_Type;
- Mapping_File : Natural := No_Mapping_File;
- Project : Project_Id := No_Project;
- Syntax_Only : Boolean := False;
- Output_Is_Object : Boolean := True;
- end record;
-
- Running_Compile : array (1 .. Max_Process) of Compilation_Data;
- -- Used to save information about outstanding compilations
-
- Outstanding_Compiles : Natural := 0;
- -- Current number of outstanding compiles
-
Source_Unit : Unit_Name_Type;
-- Current source unit
Sfile : File_Name_Type;
-- Contains the source file of the units withed by Source_File
+ Uname : Unit_Name_Type;
+ -- Contains the unit name of the units withed by Source_File
+
ALI : ALI_Id;
-- ALI Id of the current ALI file
Process_Created : Boolean := False;
procedure Add_Process
- (Pid : Process_Id;
- Sfile : File_Name_Type;
- Afile : File_Name_Type;
- Uname : Unit_Name_Type;
- Mfile : Natural := No_Mapping_File);
+ (Pid : Process_Id;
+ Sfile : File_Name_Type;
+ Afile : File_Name_Type;
+ Uname : Unit_Name_Type;
+ Mfile : Natural := No_Mapping_File);
-- Adds process Pid to the current list of outstanding compilation
-- processes and record the full name of the source file Sfile that
-- we are compiling, the name of its library file Afile and the
-- Check if s-stalib.adb needs to be compiled
procedure Collect_Arguments_And_Compile
- (Source_File : File_Name_Type; Source_Index : Int);
+ (Source_File : File_Name_Type;
+ Source_Index : Int);
-- Collect arguments from project file (if any) and compile
function Compile
- (S : Name_Id;
- L : Name_Id;
+ (S : File_Name_Type;
+ L : File_Name_Type;
Source_Index : Int;
Args : Argument_List) return Process_Id;
- -- Compiles S using Args. If S is a GNAT predefined source
- -- "-gnatpg" is added to Args. Non blocking call. L corresponds to the
- -- expected library file name. Process_Id of the process spawned to
- -- execute the compile.
+ -- Compiles S using Args. If S is a GNAT predefined source "-gnatpg" is
+ -- added to Args. Non blocking call. L corresponds to the expected
+ -- library file name. Process_Id of the process spawned to execute the
+ -- compilation.
package Good_ALI is new Table.Table (
Table_Component_Type => ALI_Id,
-----------------
procedure Add_Process
- (Pid : Process_Id;
- Sfile : File_Name_Type;
- Afile : File_Name_Type;
- Uname : Unit_Name_Type;
- Mfile : Natural := No_Mapping_File)
+ (Pid : Process_Id;
+ Sfile : File_Name_Type;
+ Afile : File_Name_Type;
+ Uname : Unit_Name_Type;
+ Mfile : Natural := No_Mapping_File)
is
OC1 : constant Positive := Outstanding_Compiles + 1;
procedure Await_Compile
(Sfile : out File_Name_Type;
Afile : out File_Name_Type;
- Uname : out File_Name_Type;
+ Uname : out Unit_Name_Type;
OK : out Boolean)
is
- Pid : Process_Id;
+ Pid : Process_Id;
Project : Project_Id;
begin
Sfile := No_File;
Afile := No_File;
- Uname := No_Name;
+ Uname := No_Unit_Name;
OK := False;
-- The loop here is a work-around for a problem on VMS; in some
if not Targparm.Suppress_Standard_Library_On_Target then
declare
- Sfile : Name_Id;
+ Sfile : File_Name_Type;
Add_It : Boolean := True;
begin
-----------------------------------
procedure Collect_Arguments_And_Compile
- (Source_File : File_Name_Type; Source_Index : Int)
+ (Source_File : File_Name_Type;
+ Source_Index : Int)
is
begin
-- Process_Created will be set True if an attempt is made to compile
-- If arguments not yet collected (in Check), collect them now
if not Arguments_Collected then
- Collect_Arguments (Source_File, Source_Index, Args);
+ Collect_Arguments
+ (Source_File, Source_Index, Source_File = Main_Source, Args);
end if;
-- If we use mapping file (-P or -C switches), then get one
if not Project_Tree.Projects.Table
(Arguments_Project).Externally_Built
then
- Prj.Env.Set_Ada_Paths
- (Arguments_Project, Project_Tree, True);
+ Prj.Env.Set_Ada_Paths (Arguments_Project, Project_Tree, True);
if not Unique_Compile
- and then MLib.Tgt.Support_For_Libraries /= MLib.Tgt.None
+ and then MLib.Tgt.Support_For_Libraries /= Prj.None
then
declare
The_Data : Project_Data :=
Change_To_Object_Directory (Arguments_Project);
- Pid := Compile (Arguments_Path_Name, Lib_File, Source_Index,
- Arguments (1 .. Last_Argument));
+ Pid :=
+ Compile
+ (File_Name_Type (Arguments_Path_Name),
+ Lib_File,
+ Source_Index,
+ Arguments (1 .. Last_Argument));
Process_Created := True;
end if;
-------------
function Compile
- (S : Name_Id;
- L : Name_Id;
+ (S : File_Name_Type;
+ L : File_Name_Type;
Source_Index : Int;
Args : Argument_List) return Process_Id
is
Comp_Last : Integer;
Arg_Index : Integer;
- function Ada_File_Name (Name : Name_Id) return Boolean;
+ function Ada_File_Name (Name : File_Name_Type) return Boolean;
-- Returns True if Name is the name of an ada source file
-- (i.e. suffix is .ads or .adb)
-- Ada_File_Name --
-------------------
- function Ada_File_Name (Name : Name_Id) return Boolean is
+ function Ada_File_Name (Name : File_Name_Type) return Boolean is
begin
Get_Name_String (Name);
return
-- Set -gnatpg for predefined files (for this purpose the renamings
-- such as Text_IO do not count as predefined). Note that we strip
- -- the directory name from the source file name becase the call to
+ -- the directory name from the source file name because the call to
-- Fname.Is_Predefined_File_Name cannot deal with directory prefixes.
declare
begin
if Is_Predefined_File_Name (Fname, False) then
if Check_Readonly_Files then
+ Comp_Args (Comp_Args'First + 2 .. Comp_Last + 1) :=
+ Comp_Args (Comp_Args'First + 1 .. Comp_Last);
Comp_Last := Comp_Last + 1;
- Comp_Args (Comp_Last) := GNAT_Flag;
+ Comp_Args (Comp_Args'First + 1) := GNAT_Flag;
else
Make_Failed
end;
end if;
- if Source_Index /= 0 or else
- L /= Strip_Directory (L) or else
- Object_Directory_Path /= null
+ if Source_Index /= 0
+ or else L /= Strip_Directory (L)
+ or else Object_Directory_Path /= null
then
-- Build -o argument
begin
pragma Assert (Args'First = 1);
+ Outstanding_Compiles := 0;
+ Running_Compile := new Comp_Data_Arr (1 .. Max_Process);
+
-- Package and Queue initializations
Good_ALI.Init;
- Output.Set_Standard_Error;
if First_Q_Initialization then
Init_Q;
exit Make_Loop;
end if;
- -- PHASE 1: Check if there is more work that we can do (ie the Q
+ -- PHASE 1: Check if there is more work that we can do (i.e. the Q
-- is non empty). If there is, do it only if we have not yet used
-- up all the available processes.
and then In_Ada_Lib_Dir (Full_Lib_File)
then
Verbose_Msg
- (Lib_File, "is in an Ada library", Prefix => " ");
+ (Lib_File,
+ "is in an Ada library",
+ Prefix => " ",
+ Minimum_Verbosity => Opt.High);
-- If the library file is a read-only library skip it, but
-- only if, when using project files, this library file is
and then Is_In_Object_Directory (Source_File, Full_Lib_File)
then
Verbose_Msg
- (Lib_File, "is a read-only library", Prefix => " ");
+ (Lib_File,
+ "is a read-only library",
+ Prefix => " ",
+ Minimum_Verbosity => Opt.High);
-- The source file that we are checking cannot be located
elsif not Check_Readonly_Files
and then Full_Lib_File /= No_File
- and then Is_Internal_File_Name (Source_File)
+ and then Is_Internal_File_Name (Source_File, False)
then
if Force_Compilations then
Fail
end if;
Verbose_Msg
- (Lib_File, "is an internal library", Prefix => " ");
+ (Lib_File,
+ "is an internal library",
+ Prefix => " ",
+ Minimum_Verbosity => Opt.High);
-- The source file that we are checking can be located
else
Arguments_Collected := False;
- -- Don't waste any time if we have to recompile anyway
+ Collect_Arguments (Source_File, Source_Index,
+ Source_File = Main_Source, Args);
- Obj_Stamp := Empty_Time_Stamp;
- Need_To_Compile := Force_Compilations;
+ -- Do nothing if project of source is externally built
- if not Force_Compilations then
- Read_Only :=
- Full_Lib_File /= No_File
- and then not Check_Readonly_Files
- and then Is_Readonly_Library (Full_Lib_File);
- Check (Source_File, Source_Index, Args, Lib_File,
- Read_Only, ALI, Obj_File, Obj_Stamp);
- Need_To_Compile := (ALI = No_ALI_Id);
- end if;
+ if Arguments_Project = No_Project
+ or else not Project_Tree.Projects.Table
+ (Arguments_Project).Externally_Built
+ then
+ -- Don't waste any time if we have to recompile anyway
+
+ Obj_Stamp := Empty_Time_Stamp;
+ Need_To_Compile := Force_Compilations;
+
+ if not Force_Compilations then
+ Read_Only :=
+ Full_Lib_File /= No_File
+ and then not Check_Readonly_Files
+ and then Is_Readonly_Library (Full_Lib_File);
+ Check (Source_File, Source_Index,
+ Source_File = Main_Source, Args, Lib_File,
+ Read_Only, ALI, Obj_File, Obj_Stamp);
+ Need_To_Compile := (ALI = No_ALI_Id);
+ end if;
- if not Need_To_Compile then
+ if not Need_To_Compile then
+ -- The ALI file is up-to-date. Record its Id
- -- The ALI file is up-to-date. Record its Id
+ Record_Good_ALI (ALI);
- Record_Good_ALI (ALI);
+ -- Record the time stamp of the most recent object
+ -- file as long as no (re)compilations are needed.
+
+ if First_Compiled_File = No_File
+ and then (Most_Recent_Obj_File = No_File
+ or else Obj_Stamp > Most_Recent_Obj_Stamp)
+ then
+ Most_Recent_Obj_File := Obj_File;
+ Most_Recent_Obj_Stamp := Obj_Stamp;
+ end if;
- -- Record the time stamp of the most recent object file
- -- as long as no (re)compilations are needed.
+ else
+ -- Check that switch -x has been used if a source
+ -- outside of project files need to be compiled.
- if First_Compiled_File = No_File
- and then (Most_Recent_Obj_File = No_File
- or else Obj_Stamp > Most_Recent_Obj_Stamp)
- then
- Most_Recent_Obj_File := Obj_File;
- Most_Recent_Obj_Stamp := Obj_Stamp;
- end if;
+ if Main_Project /= No_Project
+ and then Arguments_Project = No_Project
+ and then not External_Unit_Compilation_Allowed
+ then
+ Make_Failed ("external source (",
+ Get_Name_String (Source_File),
+ ") is not part of any project;"
+ & " cannot be compiled without" &
+ " gnatmake switch -x");
+ end if;
- else
- -- Is this the first file we have to compile?
+ -- Is this the first file we have to compile?
- if First_Compiled_File = No_File then
- First_Compiled_File := Full_Source_File;
- Most_Recent_Obj_File := No_File;
+ if First_Compiled_File = No_File then
+ First_Compiled_File := Full_Source_File;
+ Most_Recent_Obj_File := No_File;
- if Do_Not_Execute then
- exit Make_Loop;
+ if Do_Not_Execute then
+ exit Make_Loop;
+ end if;
end if;
- end if;
- if In_Place_Mode then
+ if In_Place_Mode then
- -- If the library file was not found, then save the
- -- library file near the source file.
+ -- If the library file was not found, then save
+ -- the library file near the source file.
- if Full_Lib_File = No_File then
- Lib_File := Osint.Lib_File_Name
- (Full_Source_File, Source_Index);
+ if Full_Lib_File = No_File then
+ Lib_File := Osint.Lib_File_Name
+ (Full_Source_File, Source_Index);
- -- If the library file was found, then save the
- -- library file in the same place.
+ -- If the library file was found, then save the
+ -- library file in the same place.
- else
- Lib_File := Full_Lib_File;
- end if;
+ else
+ Lib_File := Full_Lib_File;
+ end if;
- end if;
+ end if;
- -- Start the compilation and record it. We can do this
- -- because there is at least one free process.
+ -- Start the compilation and record it. We can do
+ -- this because there is at least one free process.
- Collect_Arguments_And_Compile (Source_File, Source_Index);
+ Collect_Arguments_And_Compile
+ (Source_File, Source_Index);
- -- Make sure we could successfully start the compilation
+ -- Make sure we could successfully start
+ -- the Compilation.
- if Process_Created then
- if Pid = Invalid_Pid then
- Record_Failure (Full_Source_File, Source_Unit);
- else
- Add_Process
- (Pid,
- Full_Source_File,
- Lib_File,
- Source_Unit,
- Mfile);
+ if Process_Created then
+ if Pid = Invalid_Pid then
+ Record_Failure (Full_Source_File, Source_Unit);
+ else
+ Add_Process
+ (Pid,
+ Full_Source_File,
+ Lib_File,
+ Source_Unit,
+ Mfile);
+ end if;
end if;
end if;
end if;
Units.Table (J).First_With .. Units.Table (J).Last_With
loop
Sfile := Withs.Table (K).Sfile;
- Add_Dependency (ALIs.Table (ALI).Sfile, Sfile);
+ Uname := Withs.Table (K).Uname;
+
+ -- If project files are used, find the proper source
+ -- to compile, in case Sfile is the spec, but there
+ -- is a body.
+
+ if Main_Project /= No_Project then
+ declare
+ Unit_Name : Name_Id;
+ Uid : Prj.Unit_Index;
+ Udata : Unit_Data;
+
+ begin
+ Get_Name_String (Uname);
+ Name_Len := Name_Len - 2;
+ Unit_Name := Name_Find;
+ Uid :=
+ Units_Htable.Get
+ (Project_Tree.Units_HT, Unit_Name);
+
+ if Uid /= Prj.No_Unit_Index then
+ Udata := Project_Tree.Units.Table (Uid);
+
+ if
+ Udata.File_Names (Body_Part).Name /=
+ No_File
+ and then
+ Udata.File_Names (Body_Part).Path /= Slash
+ then
+ Sfile := Udata.File_Names (Body_Part).Name;
+ Source_Index :=
+ Udata.File_Names (Body_Part).Index;
+
+ elsif
+ Udata.File_Names (Specification).Name /=
+ No_File
+ and then
+ Udata.File_Names (Specification).Path /=
+ Slash
+ then
+ Sfile :=
+ Udata.File_Names (Specification).Name;
+ Source_Index :=
+ Udata.File_Names (Specification).Index;
+ end if;
+ end if;
+ end;
+ end if;
+
+ Dependencies.Append ((ALIs.Table (ALI).Sfile, Sfile));
if Is_In_Obsoleted (Sfile) then
Executable_Obsolete := True;
Debug_Msg ("Skipping marked file:", Sfile);
elsif not Check_Readonly_Files
- and then Is_Internal_File_Name (Sfile)
+ and then Is_Internal_File_Name (Sfile, False)
then
Debug_Msg ("Skipping internal file:", Sfile);
end Compile_Sources;
+ -----------------------------------
+ -- Compute_All_Imported_Projects --
+ -----------------------------------
+
+ procedure Compute_All_Imported_Projects (Project : Project_Id) is
+ procedure Add_To_List (Prj : Project_Id);
+ -- Add a project to the list All_Imported_Projects of project Project
+
+ procedure Recursive_Add_Imported (Project : Project_Id);
+ -- Recursively add the projects imported by project Project, but not
+ -- those that are extended.
+
+ -----------------
+ -- Add_To_List --
+ -----------------
+
+ procedure Add_To_List (Prj : Project_Id) is
+ Element : constant Project_Element :=
+ (Prj, Project_Tree.Projects.Table (Project).All_Imported_Projects);
+ List : Project_List;
+ begin
+ Project_List_Table.Increment_Last (Project_Tree.Project_Lists);
+ List := Project_List_Table.Last (Project_Tree.Project_Lists);
+ Project_Tree.Project_Lists.Table (List) := Element;
+ Project_Tree.Projects.Table (Project).All_Imported_Projects := List;
+ end Add_To_List;
+
+ ----------------------------
+ -- Recursive_Add_Imported --
+ ----------------------------
+
+ procedure Recursive_Add_Imported (Project : Project_Id) is
+ List : Project_List;
+ Element : Project_Element;
+ Prj : Project_Id;
+
+ begin
+ if Project /= No_Project then
+
+ -- For all the imported projects
+
+ List := Project_Tree.Projects.Table (Project).Imported_Projects;
+ while List /= Empty_Project_List loop
+ Element := Project_Tree.Project_Lists.Table (List);
+ Prj := Element.Project;
+
+ -- Get the ultimate extending project
+
+ while
+ Project_Tree.Projects.Table (Prj).Extended_By /= No_Project
+ loop
+ Prj := Project_Tree.Projects.Table (Prj).Extended_By;
+ end loop;
+
+ -- If project has not yet been visited, add to list and recurse
+
+ if not Project_Tree.Projects.Table (Prj).Seen then
+ Project_Tree.Projects.Table (Prj).Seen := True;
+ Add_To_List (Prj);
+ Recursive_Add_Imported (Prj);
+ end if;
+
+ List := Element.Next;
+ end loop;
+
+ -- Recurse on projects being imported, if any
+
+ Recursive_Add_Imported
+ (Project_Tree.Projects.Table (Project).Extends);
+ end if;
+ end Recursive_Add_Imported;
+
+ begin
+ -- Reset the Seen flag for all projects
+
+ for Index in 1 .. Project_Table.Last (Project_Tree.Projects) loop
+ Project_Tree.Projects.Table (Index).Seen := False;
+ end loop;
+
+ -- Make sure the list is empty
+
+ Project_Tree.Projects.Table (Project).All_Imported_Projects :=
+ Empty_Project_List;
+
+ -- Add to the list all projects imported directly or indirectly
+
+ Recursive_Add_Imported (Project);
+ end Compute_All_Imported_Projects;
+
----------------------------------
-- Configuration_Pragmas_Switch --
----------------------------------
Last : Natural := 0;
function Absolute_Path
- (Path : Name_Id;
+ (Path : Path_Name_Type;
Project : Project_Id) return String;
-- Returns an absolute path for a configuration pragmas file
-------------------
function Absolute_Path
- (Path : Name_Id;
+ (Path : Path_Name_Type;
Project : Project_Id) return String
is
begin
Parent_Directory : constant String :=
Get_Name_String
(Project_Tree.Projects.Table
- (Project).Directory);
+ (Project).Display_Directory);
begin
if Parent_Directory (Parent_Directory'Last) =
(For_Project, Main_Project, Project_Tree);
if Project_Tree.Projects.Table
- (For_Project).Config_File_Name /= No_Name
+ (For_Project).Config_File_Name /= No_Path
then
Temporary_Config_File :=
Project_Tree.Projects.Table (For_Project).Config_File_Temp;
declare
Path : constant String :=
Absolute_Path
- (Global_Attribute.Value, Global_Attribute.Project);
+ (Path_Name_Type (Global_Attribute.Value),
+ Global_Attribute.Project);
begin
if not Is_Regular_File (Path) then
Make_Failed
declare
Path : constant String :=
Absolute_Path
- (Local_Attribute.Value, Local_Attribute.Project);
+ (Path_Name_Type (Local_Attribute.Value),
+ Local_Attribute.Project);
begin
if not Is_Regular_File (Path) then
Make_Failed
end if;
end Debug_Msg;
+ procedure Debug_Msg (S : String; N : File_Name_Type) is
+ begin
+ Debug_Msg (S, Name_Id (N));
+ end Debug_Msg;
+
+ procedure Debug_Msg (S : String; N : Unit_Name_Type) is
+ begin
+ Debug_Msg (S, Name_Id (N));
+ end Debug_Msg;
+
---------------------------
-- Delete_All_Temp_Files --
---------------------------
procedure Delete_Mapping_Files is
Success : Boolean;
+ pragma Warnings (Off, Success);
begin
if not Debug.Debug_Flag_N then
if The_Mapping_File_Names /= null then
procedure Delete_Temp_Config_Files is
Success : Boolean;
+ pragma Warnings (Off, Success);
+
begin
if (not Debug.Debug_Flag_N) and Main_Project /= No_Project then
for Project in Project_Table.First ..
Project_Tree.Projects.Table (Project).
Config_Checked := False;
Project_Tree.Projects.Table (Project).
- Config_File_Name := No_Name;
+ Config_File_Name := No_Path;
Project_Tree.Projects.Table (Project).
Config_File_Temp := False;
end if;
-- Enter_Into_Obsoleted --
--------------------------
- procedure Enter_Into_Obsoleted (F : Name_Id) is
+ procedure Enter_Into_Obsoleted (F : File_Name_Type) is
Name : constant String := Get_Name_String (F);
- First : Natural := Name'Last;
- F2 : Name_Id := F;
+ First : Natural;
+ F2 : File_Name_Type;
begin
+ First := Name'Last;
while First > Name'First
and then Name (First - 1) /= Directory_Separator
and then Name (First - 1) /= '/'
Name_Len := 0;
Add_Str_To_Name_Buffer (Name (First .. Name'Last));
F2 := Name_Find;
+
+ else
+ F2 := F;
end if;
Debug_Msg ("New entry in Obsoleted table:", F2);
Obsoleted.Set (F2, True);
end Enter_Into_Obsoleted;
- ---------------------
- -- Extract_Failure --
- ---------------------
-
- procedure Extract_Failure
- (File : out File_Name_Type;
- Unit : out Unit_Name_Type;
- Found : out Boolean)
- is
- begin
- File := Bad_Compilation.Table (Bad_Compilation.Last).File;
- Unit := Bad_Compilation.Table (Bad_Compilation.Last).Unit;
- Found := Bad_Compilation.Table (Bad_Compilation.Last).Found;
- Bad_Compilation.Decrement_Last;
- end Extract_Failure;
-
--------------------
-- Extract_From_Q --
--------------------
-- Set to True when there are Stand-Alone Libraries, so that gnatbind
-- is invoked with the -F switch to force checking of elaboration flags.
- Mapping_Path : Name_Id := No_Name;
+ Mapping_Path : Path_Name_Type := No_Path;
-- The path name of the mapping file
Discard : Boolean;
+ pragma Warnings (Off, Discard);
procedure Check_Mains;
-- Check that the main subprograms do exist and that they all
Real_Path :=
Locate_Regular_File
(Main &
- Get_Name_String
- (Data.Naming.Ada_Body_Suffix),
+ Body_Suffix_Of (Project_Tree, "ada", Data.Naming),
"");
if Real_Path = null then
Real_Path :=
Locate_Regular_File
(Main &
- Get_Name_String
- (Data.Naming.Ada_Spec_Suffix),
+ Spec_Suffix_Of (Project_Tree, "ada", Data.Naming),
"");
end if;
if Normed_Path /= Proj_Path then
if Verbose_Mode then
+ Set_Standard_Error;
Write_Str (Normed_Path);
Write_Str (" /= ");
Write_Line (Proj_Path);
Mapping_FD : File_Descriptor := Invalid_FD;
-- A File Descriptor for an eventual mapping file
- ALI_Unit : Name_Id := No_Name;
+ ALI_Unit : Unit_Name_Type := No_Unit_Name;
-- The unit name of an ALI file
- ALI_Name : Name_Id := No_Name;
+ ALI_Name : File_Name_Type := No_File;
-- The file name of the ALI file
- ALI_Project : Project_Id := No_Project;
+ ALI_Project : Project_Id := No_Project;
-- The project of the ALI file
- Bytes : Integer;
- OK : Boolean := True;
+ Bytes : Integer;
+ OK : Boolean := True;
- Status : Boolean;
+ Status : Boolean;
-- For call to Close
begin
Tempdir.Create_Temp_File (Mapping_FD, Mapping_Path);
+ Record_Temp_File (Mapping_Path);
if Mapping_FD /= Invalid_FD then
Unit_Table.Last (Project_Tree.Units)
loop
declare
- Unit : constant Unit_Data :=
- Project_Tree.Units.Table (J);
+ Unit : constant Unit_Data := Project_Tree.Units.Table (J);
begin
if Unit.Name /= No_Name then
-- If there is a body, put it in the mapping
- if Unit.File_Names (Body_Part).Name /= No_Name
- and then Unit.File_Names (Body_Part).Project
- /= No_Project
+ if Unit.File_Names (Body_Part).Name /= No_File
+ and then Unit.File_Names (Body_Part).Project /=
+ No_Project
then
Get_Name_String (Unit.Name);
- Name_Buffer
- (Name_Len + 1 .. Name_Len + 2) := "%b";
+ Name_Buffer (Name_Len + 1 .. Name_Len + 2) := "%b";
Name_Len := Name_Len + 2;
ALI_Unit := Name_Find;
ALI_Name :=
Lib_File_Name
- (Unit.File_Names (Body_Part).Name);
+ (Unit.File_Names (Body_Part).Display_Name);
ALI_Project :=
Unit.File_Names (Body_Part).Project;
-- Otherwise, if there is a spec, put it
-- in the mapping.
- elsif Unit.File_Names (Specification).Name
- /= No_Name
- and then Unit.File_Names
- (Specification).Project
- /= No_Project
+ elsif Unit.File_Names (Specification).Name /= No_File
+ and then Unit.File_Names (Specification).Project /=
+ No_Project
then
Get_Name_String (Unit.Name);
- Name_Buffer
- (Name_Len + 1 .. Name_Len + 2) := "%s";
+ Name_Buffer (Name_Len + 1 .. Name_Len + 2) := "%s";
Name_Len := Name_Len + 2;
ALI_Unit := Name_Find;
- ALI_Name := Lib_File_Name
- (Unit.File_Names (Specification).Name);
+ ALI_Name :=
+ Lib_File_Name
+ (Unit.File_Names (Specification).Display_Name);
ALI_Project :=
Unit.File_Names (Specification).Project;
else
- ALI_Name := No_Name;
+ ALI_Name := No_File;
end if;
-- If we have something to put in the mapping
-- ended project obj dir as well as in the
-- extending project obj dir.
- if ALI_Name /= No_Name
+ if ALI_Name /= No_File
and then
Project_Tree.Projects.Table
(ALI_Project).Extended_By = No_Project
- and then
- Project_Tree.Projects.Table
- (ALI_Project).Extends = No_Project
+ and then
+ Project_Tree.Projects.Table
+ (ALI_Project).Extends = No_Project
then
- -- First line is the unit name
-
- Get_Name_String (ALI_Unit);
- Name_Len := Name_Len + 1;
- Name_Buffer (Name_Len) := ASCII.LF;
- Bytes :=
- Write
- (Mapping_FD,
- Name_Buffer (1)'Address,
- Name_Len);
- OK := Bytes = Name_Len;
-
- exit when not OK;
-
- -- Second line it the ALI file name
-
- Get_Name_String (ALI_Name);
- Name_Len := Name_Len + 1;
- Name_Buffer (Name_Len) := ASCII.LF;
- Bytes :=
- Write
- (Mapping_FD,
- Name_Buffer (1)'Address,
- Name_Len);
- OK := Bytes = Name_Len;
-
- exit when not OK;
-
- -- Third line it the ALI path name,
- -- concatenation of the project
- -- directory with the ALI file name.
+ -- First check if the ALI file exists. If it does not,
+ -- do not put the unit in the mapping file.
declare
ALI : constant String :=
Get_Name_String (ALI_Name);
+ PD : Project_Data renames
+ Project_Tree.Projects.Table (ALI_Project);
+
begin
- Get_Name_String
- (Project_Tree.Projects.Table
- (ALI_Project).Object_Directory);
+ -- For library projects, use the library directory,
+ -- for other projects, use the object directory.
+
+ if PD.Library then
+ Get_Name_String (PD.Library_Dir);
+ else
+ Get_Name_String (PD.Object_Directory);
+ end if;
if Name_Buffer (Name_Len) /=
Directory_Separator
Name_Len :=
Name_Len + ALI'Length + 1;
Name_Buffer (Name_Len) := ASCII.LF;
- Bytes :=
- Write
- (Mapping_FD,
- Name_Buffer (1)'Address,
- Name_Len);
- OK := Bytes = Name_Len;
- end;
-
- -- If OK is False, it means we were unable
- -- to write a line. No point in continuing
- -- with the other units.
- exit when not OK;
+ declare
+ ALI_Path_Name : constant String :=
+ Name_Buffer (1 .. Name_Len);
+
+ begin
+ if Is_Regular_File
+ (ALI_Path_Name (1 .. ALI_Path_Name'Last - 1))
+ then
+
+ -- First line is the unit name
+
+ Get_Name_String (ALI_Unit);
+ Name_Len := Name_Len + 1;
+ Name_Buffer (Name_Len) := ASCII.LF;
+ Bytes :=
+ Write
+ (Mapping_FD,
+ Name_Buffer (1)'Address,
+ Name_Len);
+ OK := Bytes = Name_Len;
+
+ exit when not OK;
+
+ -- Second line it the ALI file name
+
+ Get_Name_String (ALI_Name);
+ Name_Len := Name_Len + 1;
+ Name_Buffer (Name_Len) := ASCII.LF;
+ Bytes :=
+ Write
+ (Mapping_FD,
+ Name_Buffer (1)'Address,
+ Name_Len);
+ OK := Bytes = Name_Len;
+
+ exit when not OK;
+
+ -- Third line it the ALI path name
+
+ Bytes :=
+ Write
+ (Mapping_FD,
+ ALI_Path_Name (1)'Address,
+ ALI_Path_Name'Length);
+ OK := Bytes = ALI_Path_Name'Length;
+
+ -- If OK is False, it means we were unable
+ -- to write a line. No point in continuing
+ -- with the other units.
+
+ exit when not OK;
+ end if;
+ end;
+ end;
end if;
end if;
end;
Link_With_Shared_Libgcc := No_Shared_Libgcc_Switch'Access;
Failed_Links.Set_Last (0);
- Successful_Links.Set_Last (0);
-
- if Hostparm.Java_VM then
- Gcc := new String'("jgnat");
- Gnatbind := new String'("jgnatbind");
- Gnatlink := new String'("jgnatlink");
-
- -- Do not check for an object file (".o") when compiling to
- -- Java bytecode since ".class" files are generated instead.
-
- Check_Object_Consistency := False;
- end if;
+ Successful_Links.Set_Last (0);
-- Special case when switch -B was specified
Make_Failed ("-B cannot be used for a library project file");
else
+ No_Main_Subprogram := True;
Insert_Project_Sources
(The_Project => Main_Project,
All_Projects => Unique_Compile_All_Projects,
declare
Value : String_List_Id :=
- Project_Tree.Projects.Table (Main_Project).Mains;
+ Project_Tree.Projects.Table (Main_Project).Mains;
begin
-- The attribute Main is an empty list or not specified,
-- Put all the sources in the queue
+ No_Main_Subprogram := True;
Insert_Project_Sources
(The_Project => Main_Project,
All_Projects => Unique_Compile_All_Projects,
if Verbose_Mode then
Write_Eol;
- Write_Str ("GNATMAKE ");
- Write_Str (Gnatvsn.Gnat_Version_String);
- Write_Eol;
- Write_Str ("Copyright 1995-2004 Free Software Foundation, Inc.");
- Write_Eol;
+ Display_Version ("GNATMAKE ", "1995");
end if;
if Main_Project /= No_Project
Osint.Add_Default_Search_Dirs;
+ -- Get the target parameters, so that the correct binder generated
+ -- files are generated if OpenVMS is the target.
+
+ begin
+ Targparm.Get_Target_Parameters;
+
+ exception
+ when Unrecoverable_Error =>
+ Make_Failed ("*** make failed.");
+ end;
+
-- And bind and or link the library
MLib.Prj.Build_Library
Do_Not_Execute := True;
end if;
- -- Note that Osint.Next_Main_Source will always return the (possibly
+ -- Note that Osint.M.Next_Main_Source will always return the (possibly
-- abbreviated file) without any directory information.
Main_Source_File := Next_Main_Source;
Main_Index := Current_File_Index;
end if;
- Add_Switch ("-I-", Binder, And_Save => True);
Add_Switch ("-I-", Compiler, And_Save => True);
if Main_Project = No_Project then
Compiler, Append_Switch => False,
And_Save => False);
- Add_Switch ("-aO" & Normalized_CWD,
- Binder,
- Append_Switch => False,
- And_Save => False);
end if;
else
-- projects.
Look_In_Primary_Dir := False;
+ Add_Switch ("-I-", Binder, And_Save => True);
end if;
-- If the user wants a program without a main subprogram, add the
if Main_Project /= No_Project then
if Project_Tree.Projects.Table
- (Main_Project).Object_Directory /= No_Name
+ (Main_Project).Object_Directory /= No_Path
then
-- Change current directory to object directory of main project
- Project_Object_Directory := No_Project;
+ Project_Of_Current_Object_Directory := No_Project;
Change_To_Object_Directory (Main_Project);
end if;
not Unique_Compile);
The_Packages : constant Package_Id :=
- Project_Tree.Projects.Table (Main_Project).Decl.Packages;
+ Project_Tree.Projects.Table
+ (Main_Project).Decl.Packages;
Builder_Package : constant Prj.Package_Id :=
- Prj.Util.Value_Of
- (Name => Name_Builder,
- In_Packages => The_Packages,
- In_Tree => Project_Tree);
+ Prj.Util.Value_Of
+ (Name => Name_Builder,
+ In_Packages => The_Packages,
+ In_Tree => Project_Tree);
Binder_Package : constant Prj.Package_Id :=
- Prj.Util.Value_Of
- (Name => Name_Binder,
- In_Packages => The_Packages,
- In_Tree => Project_Tree);
+ Prj.Util.Value_Of
+ (Name => Name_Binder,
+ In_Packages => The_Packages,
+ In_Tree => Project_Tree);
Linker_Package : constant Prj.Package_Id :=
- Prj.Util.Value_Of
- (Name => Name_Linker,
- In_Packages => The_Packages,
- In_Tree => Project_Tree);
+ Prj.Util.Value_Of
+ (Name => Name_Linker,
+ In_Packages => The_Packages,
+ In_Tree => Project_Tree);
begin
-- We fail if we cannot find the main source file
-- If there are several mains, we always get the general
-- gnatmake switches (if any).
- -- Warn the user, if necessary, so that he is not surprized
+ -- Warn the user, if necessary, so that he is not surprised
-- that specific switches are not taken into account.
declare
-- Record the current last switch index for table Binder_Switches
-- and Linker_Switches, so that these tables may be reset before
- -- for each main, before adding swiches from the project file
+ -- for each main, before adding switches from the project file
-- and from the command line.
Last_Binder_Switch := Binder_Switches.Last;
begin
Targparm.Get_Target_Parameters;
-
exception
when Unrecoverable_Error =>
Make_Failed ("*** make failed.");
end;
+ -- Special processing for VM targets
+
+ if Targparm.VM_Target /= No_VM then
+
+ -- Set proper processing commands
+
+ case Targparm.VM_Target is
+ when Targparm.JVM_Target =>
+
+ -- Do not check for an object file (".o") when compiling to
+ -- JVM machine since ".class" files are generated instead.
+
+ Check_Object_Consistency := False;
+
+ Gcc := new String'("jgnat");
+ Gnatbind := new String'("jgnatbind");
+ Gnatlink := new String'("jgnatlink");
+
+ when Targparm.CLI_Target =>
+ Gcc := new String'("dotnet-gnatcompile");
+
+ when Targparm.No_VM =>
+ raise Program_Error;
+ end case;
+ end if;
+
Display_Commands (not Quiet_Output);
Check_Steps;
if Main_Project /= No_Project then
- -- For all library project, if the library file does not exist
- -- put all the project sources in the queue, and flag the project
- -- so that the library is generated.
+ -- For all library project, if the library file does not exist, put
+ -- all the project sources in the queue, and flag the project so that
+ -- the library is generated.
if not Unique_Compile
- and then MLib.Tgt.Support_For_Libraries /= MLib.Tgt.None
+ and then MLib.Tgt.Support_For_Libraries /= Prj.None
then
for Proj in Project_Table.First ..
Project_Table.Last (Project_Tree.Projects)
and then (not Project_Tree.Projects.Table
(Proj).Externally_Built);
- if Project_Tree.Projects.Table
- (Proj).Need_To_Build_Lib
- then
+ if Project_Tree.Projects.Table (Proj).Need_To_Build_Lib then
+
-- If there is no object directory, then it will be
-- impossible to build the library. So fail immediately.
- if Project_Tree.Projects.Table
- (Proj).Object_Directory = No_Name
+ if Project_Tree.Projects.Table (Proj).Object_Directory =
+ No_Path
then
Make_Failed
("no object files to build library for project """,
if Saved_Linker_Switches.Table (J).all = Output_Flag.all then
declare
Exec_File_Name : constant String :=
- Saved_Linker_Switches.Table (J + 1).all;
+ Saved_Linker_Switches.Table (J + 1).all;
begin
if not Is_Absolute_Path (Exec_File_Name) then
declare
Dir_Path : constant String_Access :=
- new String'(Get_Name_String
- (Project_Tree.Projects.Table
- (Main_Project).Directory));
+ new String'(Get_Name_String
+ (Project_Tree.Projects.Table
+ (Main_Project).Directory));
begin
for J in 1 .. Binder_Switches.Last loop
Test_If_Relative_Path
for J in 1 .. Gcc_Switches.Last loop
Test_If_Relative_Path
- (Gcc_Switches.Table (J), Parent => Dir_Path);
+ (Gcc_Switches.Table (J),
+ Parent => Dir_Path,
+ Including_Non_Switch => False);
end loop;
for J in 1 .. Saved_Gcc_Switches.Last loop
Test_If_Relative_Path
- (Saved_Gcc_Switches.Table (J), Parent => Current_Work_Dir);
+ (Saved_Gcc_Switches.Table (J),
+ Parent => Current_Work_Dir,
+ Including_Non_Switch => False);
end loop;
end;
end if;
end loop;
else
- -- And we put the command line gcc switches in the variable
- -- The_Saved_Gcc_Switches. They are going to be used later
+ -- If there is a project, put the command line gcc switches in the
+ -- variable The_Saved_Gcc_Switches. They are going to be used later
-- in procedure Compile_Sources.
The_Saved_Gcc_Switches :=
The_Saved_Gcc_Switches (The_Saved_Gcc_Switches'Last) :=
No_gnat_adc;
-
end if;
-- If there was a --GCC, --GNATBIND or --GNATLINK switch on
-- number of compilation processed, for each possible project.
The_Mapping_File_Names :=
- new Temp_File_Names
+ new Temp_Path_Names
(No_Project .. Project_Table.Last (Project_Tree.Projects),
1 .. Saved_Maximum_Processes);
Last_Mapping_File_Names :=
Bad_Compilation.Init;
+ -- If project files are used, create the mapping of all the sources,
+ -- so that the correct paths will be found. Otherwise, if there is
+ -- a file which is not a source with the same name in a source directory
+ -- this file may be incorrectly found.
+
+ if Main_Project /= No_Project then
+ Prj.Env.Create_Mapping (Project_Tree);
+ end if;
+
Current_Main_Index := Main_Index;
-- Here is where the make process is started
Executable := No_File;
Executable_Obsolete := False;
- Non_Std_Executable := False;
+ Non_Std_Executable :=
+ Targparm.Executable_Extension_On_Target /= No_Name;
- -- Look inside the linker switches to see if the name
- -- of the final executable program was specified.
+ -- Look inside the linker switches to see if the name of the final
+ -- executable program was specified.
for
J in reverse Linker_Switches.First .. Linker_Switches.Last
end if;
end loop;
- -- If the name of the final executable program was not
- -- specified then construct it from the main input file.
+ -- If the name of the final executable program was not specified
+ -- then construct it from the main input file.
if Executable = No_File then
if Main_Project = No_Project then
Executable_Name (Strip_Suffix (Main_Source_File));
else
- -- If we are using a project file, we attempt to
- -- remove the body (or spec) termination of the main
- -- subprogram. We find it the the naming scheme of the
- -- project file. This will avoid to generate an
- -- executable "main.2" for a main subprogram
+ -- If we are using a project file, we attempt to remove the
+ -- body (or spec) termination of the main subprogram. We find
+ -- it the naming scheme of the project file. This avoids
+ -- generating an executable "main.2" for a main subprogram
-- "main.2.ada", when the body termination is ".2.ada".
Executable :=
if Main_Project /= No_Project then
declare
Exec_File_Name : constant String :=
- Get_Name_String (Executable);
+ Get_Name_String (Executable);
begin
if not Is_Absolute_Path (Exec_File_Name) then
-
Get_Name_String (Project_Tree.Projects.Table
- (Main_Project).Exec_Directory);
+ (Main_Project).Display_Exec_Dir);
- if
- Name_Buffer (Name_Len) /= Directory_Separator
- then
+ if Name_Buffer (Name_Len) /= Directory_Separator then
Name_Len := Name_Len + 1;
Name_Buffer (Name_Len) := Directory_Separator;
end if;
if Do_Compile_Step then
Recursive_Compilation_Step : declare
- Args : Argument_List (1 .. Gcc_Switches.Last);
+ Args : Argument_List (1 .. Gcc_Switches.Last);
- First_Compiled_File : Name_Id;
- Youngest_Obj_File : Name_Id;
+ First_Compiled_File : File_Name_Type;
+ Youngest_Obj_File : File_Name_Type;
Youngest_Obj_Stamp : Time_Stamp_Type;
Executable_Stamp : Time_Stamp_Type;
goto Next_Main;
else
List_Bad_Compilations;
- raise Compilation_Failed;
+ Report_Compilation_Failed;
end if;
end if;
- -- Regenerate libraries, if any, and if object files
+ -- Regenerate libraries, if there are any and if object files
-- have been regenerated.
if Main_Project /= No_Project
- and then MLib.Tgt.Support_For_Libraries /= MLib.Tgt.None
- and then (Do_Bind_Step or Unique_Compile_All_Projects
- or not Compile_Only)
+ and then MLib.Tgt.Support_For_Libraries /= Prj.None
+ and then (Do_Bind_Step
+ or Unique_Compile_All_Projects
+ or not Compile_Only)
and then (Do_Link_Step or N_File = Osint.Number_Of_Files)
then
Library_Projs.Init;
declare
- Proj2 : Project_Id;
Depth : Natural;
Current : Natural;
+ procedure Add_To_Library_Projs (Proj : Project_Id);
+ -- Add project Project to table Library_Projs in
+ -- decreasing depth order.
+
+ --------------------------
+ -- Add_To_Library_Projs --
+ --------------------------
+
+ procedure Add_To_Library_Projs (Proj : Project_Id) is
+ Prj : Project_Id;
+
+ begin
+ Library_Projs.Increment_Last;
+ Depth := Project_Tree.Projects.Table (Proj).Depth;
+
+ -- Put the projects in decreasing depth order, so that
+ -- if libA depends on libB, libB is first in order.
+
+ Current := Library_Projs.Last;
+ while Current > 1 loop
+ Prj := Library_Projs.Table (Current - 1);
+ exit when Project_Tree.Projects.Table
+ (Prj).Depth >= Depth;
+ Library_Projs.Table (Current) := Prj;
+ Current := Current - 1;
+ end loop;
+
+ Library_Projs.Table (Current) := Proj;
+ end Add_To_Library_Projs;
+
+ -- Start of processing for ??? (should name declare block
+ -- or probably better, break this out as a nested proc).
+
begin
-- Put in Library_Projs table all library project
-- file ids when the library need to be rebuilt.
There_Are_Stand_Alone_Libraries := True;
end if;
- if Project_Tree.Projects.Table (Proj1).Library
- and then not Project_Tree.Projects.Table
- (Proj1).Need_To_Build_Lib
- and then not Project_Tree.Projects.Table
- (Proj1).Externally_Built
- then
+ if Project_Tree.Projects.Table (Proj1).Library then
MLib.Prj.Check_Library (Proj1, Project_Tree);
end if;
if Project_Tree.Projects.Table
(Proj1).Need_To_Build_Lib
then
- Library_Projs.Increment_Last;
- Current := Library_Projs.Last;
- Depth := Project_Tree.Projects.Table
- (Proj1).Depth;
-
- -- Put the projects in decreasing depth order,
- -- so that if libA depends on libB, libB is first
- -- in order.
+ Add_To_Library_Projs (Proj1);
+ end if;
+ end loop;
- while Current > 1 loop
- Proj2 := Library_Projs.Table (Current - 1);
- exit when Project_Tree.Projects.Table
- (Proj2).Depth >= Depth;
- Library_Projs.Table (Current) := Proj2;
- Current := Current - 1;
- end loop;
+ -- Check if importing libraries should be regenerated
+ -- because at least an imported library will be
+ -- regenerated or is more recent.
- Library_Projs.Table (Current) := Proj1;
- Project_Tree.Projects.Table
- (Proj1).Need_To_Build_Lib := False;
+ for Proj1 in Project_Table.First ..
+ Project_Table.Last (Project_Tree.Projects)
+ loop
+ if Project_Tree.Projects.Table (Proj1).Library
+ and then
+ Project_Tree.Projects.Table (Proj1).Library_Kind /=
+ Static
+ and then not Project_Tree.Projects.Table
+ (Proj1).Need_To_Build_Lib
+ and then not Project_Tree.Projects.Table
+ (Proj1).Externally_Built
+ then
+ declare
+ List : Project_List;
+ Element : Project_Element;
+ Proj2 : Project_Id;
+ Rebuild : Boolean := False;
+
+ Lib_Timestamp1 : constant Time_Stamp_Type :=
+ Project_Tree.Projects.Table
+ (Proj1).Library_TS;
+
+ begin
+ List := Project_Tree.Projects.Table (Proj1).
+ All_Imported_Projects;
+ while List /= Empty_Project_List loop
+ Element :=
+ Project_Tree.Project_Lists.Table (List);
+ Proj2 := Element.Project;
+
+ if
+ Project_Tree.Projects.Table (Proj2).Library
+ then
+ if Project_Tree.Projects.Table (Proj2).
+ Need_To_Build_Lib
+ or else
+ (Lib_Timestamp1 <
+ Project_Tree.Projects.Table
+ (Proj2).Library_TS)
+ then
+ Rebuild := True;
+ exit;
+ end if;
+ end if;
+
+ List := Element.Next;
+ end loop;
+
+ if Rebuild then
+ Project_Tree.Projects.Table
+ (Proj1).Need_To_Build_Lib := True;
+ Add_To_Library_Projs (Proj1);
+ end if;
+ end;
end if;
end loop;
+
+ -- Reset the flags Need_To_Build_Lib for the next main,
+ -- to avoid rebuilding libraries uselessly.
+
+ for Proj1 in Project_Table.First ..
+ Project_Table.Last (Project_Tree.Projects)
+ loop
+ Project_Tree.Projects.Table
+ (Proj1).Need_To_Build_Lib := False;
+ end loop;
end;
-- Build the libraries, if any need to be built
for J in 1 .. Library_Projs.Last loop
Library_Rebuilt := True;
+
+ -- If a library is rebuilt, then executables are obsolete
+
+ Executable_Obsolete := True;
+
MLib.Prj.Build_Library
(For_Project => Library_Projs.Table (J),
In_Tree => Project_Tree,
-- 4) Made unit cannot be a main unit
- if (Do_Not_Execute
- or List_Dependencies
- or not Do_Bind_Step
- or not Is_Main_Unit)
- and then not No_Main_Subprogram
- and then not Build_Bind_And_Link_Full_Project
+ if ((Do_Not_Execute
+ or List_Dependencies
+ or not Do_Bind_Step
+ or not Is_Main_Unit)
+ and then not No_Main_Subprogram
+ and then not Build_Bind_And_Link_Full_Project)
+ or else Unique_Compile
then
if Osint.Number_Of_Files = 1 then
exit Multiple_Main_Loop;
-- since there is currently no simple way to check the
-- up-to-date status of objects
- if not Hostparm.Java_VM
+ if Targparm.VM_Target /= JVM_Target
and then First_Compiled_File = No_File
then
- Executable_Stamp := File_Stamp (Executable);
+ Executable_Stamp := File_Stamp (Executable);
if not Executable_Obsolete then
Executable_Obsolete :=
end if;
if Executable_Stamp (1) = ' ' then
- Verbose_Msg (Executable, "missing.", Prefix => " ");
+ if not No_Main_Subprogram then
+ Verbose_Msg (Executable, "missing.", Prefix => " ");
+ end if;
elsif Youngest_Obj_Stamp (1) = ' ' then
Verbose_Msg
- (Youngest_Obj_File,
- "missing.",
- Prefix => " ");
+ (Youngest_Obj_File, "missing.", Prefix => " ");
elsif Youngest_Obj_Stamp > Executable_Stamp then
Verbose_Msg
else
Verbose_Msg
- (Executable, "needs to be rebuild.",
- Prefix => " ");
+ (Executable, "needs to be rebuilt", Prefix => " ");
end if;
end if;
-- When In_Place_Mode, the library file can be located in the
-- Main_Source_File directory which may not be present in the
- -- library path. In this case, use the corresponding library file
- -- name.
+ -- library path. If it is not present then use the corresponding
+ -- library file name.
if Main_ALI_File = No_File and then In_Place_Mode then
Get_Name_String (Get_Directory (Full_Source_Name (Src_File)));
-- Check if there are shared libraries, so that gnatbind is
-- called with -shared. Check also if gnatbind is called with
-- -shared, so that gnatlink is called with -shared-libgcc
- -- for GCC version 3 and above, ensuring that the shared
- -- version of libgcc will be used.
+ -- ensuring that the shared version of libgcc will be used.
if Main_Project /= No_Project
- and then MLib.Tgt.Support_For_Libraries /= MLib.Tgt.None
+ and then MLib.Tgt.Support_For_Libraries /= Prj.None
then
for Proj in Project_Table.First ..
Project_Table.Last (Project_Tree.Projects)
end loop;
end if;
- -- If there are shared libraries, invoke gnatlink with
- -- -shared-libgcc if GCC version is 3 or more.
+ -- If shared libraries present, invoke gnatlink with
+ -- -shared-libgcc.
- if Shared_Libs and then GCC_Version >= 3 then
+ if Shared_Libs then
Link_With_Shared_Libgcc := Shared_Libgcc_Switch'Access;
end if;
if Main_Project /= No_Project then
-- Put all the source directories in ADA_INCLUDE_PATH,
- -- and all the object directories in ADA_OBJECTS_PATH
+ -- and all the object directories in ADA_OBJECTS_PATH.
Prj.Env.Set_Ada_Paths (Main_Project, Project_Tree, False);
-- file, if one was created.
if not Debug.Debug_Flag_N
- and then Mapping_Path /= No_Name
+ and then Mapping_Path /= No_Path
then
Delete_File (Get_Name_String (Mapping_Path), Discard);
end if;
-- If -dn was not specified, delete the temporary mapping file,
-- if one was created.
- if not Debug.Debug_Flag_N and then Mapping_Path /= No_Name then
+ if not Debug.Debug_Flag_N and then Mapping_Path /= No_Path then
Delete_File (Get_Name_String (Mapping_Path), Discard);
end if;
end Bind_Step;
if Do_Link_Step then
Link_Step : declare
- There_Are_Libraries : Boolean := False;
Linker_Switches_Last : constant Integer := Linker_Switches.Last;
- Path_Option : constant String_Access :=
- MLib.Linker_Library_Path_Option;
- Current : Natural;
- Proj2 : Project_Id;
- Depth : Natural;
+ Path_Option : constant String_Access :=
+ MLib.Linker_Library_Path_Option;
+ There_Are_Libraries : Boolean := False;
+ Current : Natural;
+ Proj2 : Project_Id;
+ Depth : Natural;
begin
if not Run_Path_Option then
Library_Paths.Set_Last (0);
Library_Projs.Init;
- if MLib.Tgt.Support_For_Libraries /= MLib.Tgt.None then
+ if MLib.Tgt.Support_For_Libraries /= Prj.None then
+
-- Check for library projects
for Proj1 in Project_Table.First ..
-- Add this project to table Library_Projs
There_Are_Libraries := True;
- Depth :=
- Project_Tree.Projects.Table (Proj1).Depth;
+ Depth := Project_Tree.Projects.Table (Proj1).Depth;
Library_Projs.Increment_Last;
Current := Library_Projs.Last;
new String'
(Get_Name_String
(Project_Tree.Projects.Table
- (Proj1).Library_Dir));
+ (Proj1).Display_Library_Dir));
end if;
end if;
end loop;
for Index in 1 .. Library_Projs.Last loop
+
-- Add the -L switch
Linker_Switches.Increment_Last;
Get_Name_String
(Project_Tree.Projects.Table
(Library_Projs.Table (Index)).
- Library_Dir));
+ Display_Library_Dir));
-- Add the -l switch
-- And invoke the linker
+ declare
+ Success : Boolean := False;
begin
Link (Main_ALI_File,
Link_With_Shared_Libgcc.all &
- Args (Args'First .. Last_Arg));
- Successful_Links.Increment_Last;
- Successful_Links.Table (Successful_Links.Last) :=
- Main_ALI_File;
+ Args (Args'First .. Last_Arg),
+ Success);
- exception
- when Link_Failed =>
- if Osint.Number_Of_Files = 1 or not Keep_Going then
- raise;
+ if Success then
+ Successful_Links.Increment_Last;
+ Successful_Links.Table (Successful_Links.Last) :=
+ Main_ALI_File;
- else
- Write_Line ("*** link failed");
- Failed_Links.Increment_Last;
- Failed_Links.Table (Failed_Links.Last) :=
- Main_ALI_File;
+ elsif Osint.Number_Of_Files = 1 or not Keep_Going then
+ Make_Failed ("*** link failed.");
+
+ else
+ Set_Standard_Error;
+ Write_Line ("*** link failed");
+
+ if Commands_To_Stdout then
+ Set_Standard_Output;
end if;
+
+ Failed_Links.Increment_Last;
+ Failed_Links.Table (Failed_Links.Last) :=
+ Main_ALI_File;
+ end if;
end;
end;
Write_Line (""" succeeded.");
end loop;
+ Set_Standard_Error;
+
for Index in 1 .. Failed_Links.Last loop
Write_Str ("Linking of """);
Write_Str (Get_Name_String (Failed_Links.Table (Index)));
Write_Line (""" failed.");
end loop;
+ if Commands_To_Stdout then
+ Set_Standard_Output;
+ end if;
+
if Total_Compilation_Failures = 0 then
- raise Compilation_Failed;
+ Report_Compilation_Failed;
end if;
end if;
if Total_Compilation_Failures /= 0 then
List_Bad_Compilations;
- raise Compilation_Failed;
+ Report_Compilation_Failed;
end if;
-- Delete the temporary mapping file that was created if we are
Prj.Env.Delete_All_Path_Files (Project_Tree);
end if;
- Exit_Program (E_Success);
-
exception
- when Bind_Failed =>
- Make_Failed ("*** bind failed.");
-
- when Compilation_Failed =>
- if not Debug.Debug_Flag_N then
- Delete_Mapping_Files;
- Prj.Env.Delete_All_Path_Files (Project_Tree);
- end if;
-
- Exit_Program (E_Fatal);
-
- when Link_Failed =>
- Make_Failed ("*** link failed.");
-
when X : others =>
+ Set_Standard_Error;
Write_Line (Exception_Information (X));
Make_Failed ("INTERNAL ERROR. Please report.");
end Gnatmake;
-- Hash --
----------
- function Hash (F : Name_Id) return Header_Num is
+ function Hash (F : File_Name_Type) return Header_Num is
begin
return Header_Num (1 + F mod Max_Header);
end Hash;
--------------------
function In_Ada_Lib_Dir (File : File_Name_Type) return Boolean is
- D : constant Name_Id := Get_Directory (File);
- B : constant Byte := Get_Name_Table_Byte (D);
+ D : constant File_Name_Type := Get_Directory (File);
+ B : constant Byte := Get_Name_Table_Byte (D);
begin
return (B and Ada_Lib_Dir) /= 0;
end In_Ada_Lib_Dir;
- ------------
- -- Inform --
- ------------
-
- procedure Inform (N : Name_Id := No_Name; Msg : String) is
- begin
- Osint.Write_Program_Name;
-
- Write_Str (": ");
-
- if N /= No_Name then
- Write_Str ("""");
- Write_Name (N);
- Write_Str (""" ");
- end if;
-
- Write_Str (Msg);
- Write_Eol;
- end Inform;
-
-----------------------
-- Init_Mapping_File --
-----------------------
(Project : Project_Id;
File_Index : in out Natural)
is
- FD : File_Descriptor;
-
+ FD : File_Descriptor;
Status : Boolean;
-- For call to Close
(FD,
The_Mapping_File_Names
(No_Project, Last_Mapping_File_Names (No_Project)));
+
if FD = Invalid_FD then
Make_Failed ("disk full");
+
+ else
+ Record_Temp_File
+ (The_Mapping_File_Names
+ (No_Project, Last_Mapping_File_Names (No_Project)));
end if;
Close (FD, Status);
----------------
procedure Initialize is
+
+ procedure Check_Version_And_Help is
+ new Check_Version_And_Help_G (Makeusg);
+
+ -- Start of processing for Initialize
+
begin
- -- Override default initialization of Check_Object_Consistency
- -- since this is normally False for GNATBIND, but is True for
- -- GNATMAKE since we do not need to check source consistency
- -- again once GNATMAKE has looked at the sources to check.
+ Prj.Set_Mode (Ada_Only);
+
+ -- Override default initialization of Check_Object_Consistency since
+ -- this is normally False for GNATBIND, but is True for GNATMAKE since
+ -- we do not need to check source consistency again once GNATMAKE has
+ -- looked at the sources to check.
Check_Object_Consistency := True;
Mains.Delete;
-- Add the directory where gnatmake is invoked in front of the
- -- path, if gnatmake is invoked with directory information.
- -- Only do this if the platform is not VMS, where the notion of path
- -- does not really exist.
+ -- path, if gnatmake is invoked from a bin directory or with directory
+ -- information. Only do this if the platform is not VMS, where the
+ -- notion of path does not really exist.
if not OpenVMS then
declare
+ Prefix : constant String := Executable_Prefix_Path;
Command : constant String := Command_Name;
begin
- for Index in reverse Command'Range loop
- if Command (Index) = Directory_Separator then
- declare
- Absolute_Dir : constant String :=
- Normalize_Pathname
- (Command (Command'First .. Index));
-
- PATH : constant String :=
- Absolute_Dir &
- Path_Separator &
- Getenv ("PATH").all;
+ if Prefix'Length > 0 then
+ declare
+ PATH : constant String :=
+ Prefix & Directory_Separator & "bin" &
+ Path_Separator &
+ Getenv ("PATH").all;
+ begin
+ Setenv ("PATH", PATH);
+ end;
- begin
- Setenv ("PATH", PATH);
- end;
+ else
+ for Index in reverse Command'Range loop
+ if Command (Index) = Directory_Separator then
+ declare
+ Absolute_Dir : constant String :=
+ Normalize_Pathname
+ (Command (Command'First .. Index));
+ PATH : constant String :=
+ Absolute_Dir &
+ Path_Separator &
+ Getenv ("PATH").all;
+ begin
+ Setenv ("PATH", PATH);
+ end;
- exit;
- end if;
- end loop;
+ exit;
+ end if;
+ end loop;
+ end if;
end;
end if;
-- Scan the switches and arguments
+ -- First, scan to detect --version and/or --help
+
+ Check_Version_And_Help ("GNATMAKE", "1995");
+
+ -- Scan again the switch and arguments, now that we are sure that they
+ -- do not include --version or --help.
+
Scan_Args : for Next_Arg in 1 .. Argument_Count loop
Scan_Make_Arg (Argument (Next_Arg), And_Save => True);
end loop Scan_Args;
+ if Commands_To_Stdout then
+ Set_Standard_Output;
+ end if;
+
if Usage_Requested then
Usage;
end if;
-- Test for simultaneity of -i and -D
if Object_Directory_Path /= null and then In_Place_Mode then
- Make_Failed ("-i and -D cannot be used simutaneously");
+ Make_Failed ("-i and -D cannot be used simultaneously");
end if;
-- Deal with -C= switch
if Gnatmake_Mapping_File /= null then
+
-- First, check compatibility with other switches
if Project_File_Name /= null then
if Verbose_Mode then
Write_Eol;
- Write_Str ("Parsing Project File """);
+ Write_Str ("Parsing project file """);
Write_Str (Project_File_Name.all);
Write_Str (""".");
Write_Eol;
Make_Failed ("""", Project_File_Name.all, """ processing failed");
end if;
+ Create_Mapping_File := True;
+
if Verbose_Mode then
Write_Eol;
- Write_Str ("Parsing of Project File """);
+ Write_Str ("Parsing of project file """);
Write_Str (Project_File_Name.all);
Write_Str (""" is finished.");
Write_Eol;
Project_Tree.Projects.Table (Proj).Depth := 0;
end loop;
- Recursive_Compute_Depth
- (Main_Project, Depth => 1);
+ Recursive_Compute_Depth (Main_Project, Depth => 1);
+
+ -- For each project compute the list of the projects it imports
+ -- directly or indirectly.
+
+ for Proj in Project_Table.First ..
+ Project_Table.Last (Project_Tree.Projects)
+ loop
+ Compute_All_Imported_Projects (Proj);
+ end loop;
else
Osint.Add_Default_Search_Dirs;
- -- Source file lookups should be cached for efficiency.
- -- Source files are not supposed to change. However, we do that now
- -- only if no project file is used; if a project file is used, we
- -- do it just after changing the directory to the object directory.
+ -- Source file lookups should be cached for efficiency. Source files
+ -- are not supposed to change. However, we do that now only if no
+ -- project file is used; if a project file is used, we do it just
+ -- after changing the directory to the object directory.
Osint.Source_File_Data (Cache => True);
-- Make sure no project object directory is recorded
- Project_Object_Directory := No_Project;
+ Project_Of_Current_Object_Directory := No_Project;
end Initialize;
is
Put_In_Q : Boolean := Into_Q;
Unit : Unit_Data;
- Sfile : Name_Id;
+ Sfile : File_Name_Type;
Extending : constant Boolean :=
Project_Tree.Projects.Table
(The_Project).Extends /= No_Project;
function Check_Project (P : Project_Id) return Boolean;
- -- Returns True if P is The_Project or a project extended by
- -- The_Project.
+ -- Returns True if P is The_Project or a project extended by The_Project
-------------------
-- Check_Project --
begin
if All_Projects or P = The_Project then
return True;
+
elsif Extending then
declare
Data : Project_Data :=
Unit_Table.Last (Project_Tree.Units)
loop
Unit := Project_Tree.Units.Table (Id);
- Sfile := No_Name;
+ Sfile := No_File;
-- If there is a source for the body, and the body has not been
-- locally removed,
- 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
-- And it is a source for the specified project
-- If we don't have a spec, we cannot consider the source
-- if it is a subunit
- if Unit.File_Names (Specification).Name = No_Name then
+ if Unit.File_Names (Specification).Name = No_File then
declare
Src_Ind : Source_File_Index;
-- Here we are cheating a little bit: we don't want to
-- use Sinput.L, because it depends on the GNAT tree
- -- (Atree, Sinfo, ...). So, we pretend that it is
- -- a project file, and we use Sinput.P.
- -- Source_File_Is_Subunit is just scanning through
- -- the file until it finds one of the reserved words
+ -- (Atree, Sinfo, ...). So, we pretend that it is a
+ -- project file, and we use Sinput.P.
+
+ -- Source_File_Is_Subunit is just scanning through the
+ -- file until it finds one of the reserved words
-- separate, procedure, function, generic or package.
-- Fortunately, these Ada reserved words are also
-- reserved for project files.
-- If it is a subunit, discard it
if Sinput.P.Source_File_Is_Subunit (Src_Ind) then
- Sfile := No_Name;
-
+ Sfile := No_File;
else
- Sfile := Unit.File_Names (Body_Part).Name;
+ Sfile := Unit.File_Names (Body_Part).Display_Name;
end if;
end;
else
- Sfile := Unit.File_Names (Body_Part).Name;
+ Sfile := Unit.File_Names (Body_Part).Display_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)
then
-- for the spec which has not been locally removed, then we take
-- this one.
- Sfile := Unit.File_Names (Specification).Name;
+ Sfile := Unit.File_Names (Specification).Display_Name;
end if;
-- If Put_In_Q is True, we insert into the Q
if Put_In_Q then
- -- For the first source inserted into the Q, we need
- -- to initialize the Q, but not for the subsequent sources.
+ -- For the first source inserted into the Q, we need to initialize
+ -- the Q, but not for the subsequent sources.
if First_Q_Initialization then
Init_Q;
end if;
- -- And of course, we only insert in the Q if the source
- -- is not marked.
+ -- And of course, we only insert in the Q if the source is not
+ -- marked.
- if Sfile /= No_Name and then not Is_Marked (Sfile) then
+ if Sfile /= No_File and then not Is_Marked (Sfile) then
if Verbose_Mode then
Write_Str ("Adding """);
Write_Str (Get_Name_String (Sfile));
Mark (Sfile);
end if;
- elsif Sfile /= No_Name then
+ elsif Sfile /= No_File then
- -- If Put_In_Q is False, we add the source as it it were
- -- specified on the command line, and we set Put_In_Q to True,
- -- so that the following sources will be put directly in the
- -- queue. This will allow parallel compilation processes if -jx
- -- switch is used.
+ -- If Put_In_Q is False, we add the source as it it were specified
+ -- on the command line, and we set Put_In_Q to True, so that the
+ -- following sources will be put directly in the queue. This will
+ -- allow parallel compilation processes if -jx switch is used.
if Verbose_Mode then
Write_Str ("Adding """);
procedure Insert_Q
(Source_File : File_Name_Type;
- Source_Unit : Unit_Name_Type := No_Name;
+ Source_Unit : Unit_Name_Type := No_Unit_Name;
Index : Int := 0)
is
begin
-- Is_In_Obsoleted --
---------------------
- function Is_In_Obsoleted (F : Name_Id) return Boolean is
+ function Is_In_Obsoleted (F : File_Name_Type) return Boolean is
begin
if F = No_File then
return False;
else
declare
Name : constant String := Get_Name_String (F);
- First : Natural := Name'Last;
- F2 : Name_Id := F;
+ First : Natural;
+ F2 : File_Name_Type;
begin
+ First := Name'Last;
while First > Name'First
and then Name (First - 1) /= Directory_Separator
and then Name (First - 1) /= '/'
Name_Len := 0;
Add_Str_To_Name_Buffer (Name (First .. Name'Last));
F2 := Name_Find;
+
+ else
+ F2 := F;
end if;
return Obsoleted.Get (F2);
Source_File_Name : constant String :=
Get_Name_String (Source_File);
Saved_Verbosity : constant Verbosity := Current_Verbosity;
- Project : Project_Id := No_Project;
- Path_Name : Name_Id := No_Name;
+ Project : Project_Id := No_Project;
Data : Project_Data;
+ Path_Name : Path_Name_Type := No_Path;
+ pragma Warnings (Off, Path_Name);
+
begin
-- Call Get_Reference to know the ultimate extending project of
-- the source. Call it with verbosity default to avoid verbose
-- messages.
Current_Verbosity := Default;
- Prj.Env.
- Get_Reference
+ Prj.Env.Get_Reference
(Source_File_Name => Source_File_Name,
Project => Project,
In_Tree => Project_Tree,
-- in its object directory. If it is not, return False, so that
-- the ALI file will not be skipped.
- -- If the source is not in an extending project, we fall back to
- -- the general case and return True at the end of the function.
-
- if Project /= No_Project
- and then Project_Tree.Projects.Table
- (Project).Extends /= No_Project
- then
+ if Project /= No_Project then
Data := Project_Tree.Projects.Table (Project);
declare
Object_Directory : constant String :=
Normalize_Pathname
(Get_Name_String
- (Data.Object_Directory));
+ (Data.Display_Object_Dir));
Olast : Natural := Object_Directory'Last;
begin
-- For directories, Normalize_Pathname may or may not put
-- a directory separator at the end, depending on its input.
- -- Remove any last directory separator before comparaison.
+ -- Remove any last directory separator before comparison.
-- Returns True only if the two directories are the same.
if Object_Directory (Olast) = Directory_Separator then
-- Link --
----------
- procedure Link (ALI_File : File_Name_Type; Args : Argument_List) is
+ procedure Link
+ (ALI_File : File_Name_Type;
+ Args : Argument_List;
+ Success : out Boolean)
+ is
Link_Args : Argument_List (1 .. Args'Length + 1);
- Success : Boolean;
begin
Get_Name_String (ALI_File);
end if;
GNAT.OS_Lib.Spawn (Gnatlink_Path.all, Link_Args, Success);
-
- if not Success then
- raise Link_Failed;
- end if;
end Link;
---------------------------
-----------------
procedure List_Depend is
- Lib_Name : Name_Id;
- Obj_Name : Name_Id;
- Src_Name : Name_Id;
+ Lib_Name : File_Name_Type;
+ Obj_Name : File_Name_Type;
+ Src_Name : File_Name_Type;
Len : Natural;
Line_Pos : Natural;
Write_Eol;
end loop;
- Set_Standard_Error;
+ if not Commands_To_Stdout then
+ Set_Standard_Error;
+ end if;
end List_Depend;
-----------------
--------------------
procedure Mark_Directory
- (Dir : String;
- Mark : Lib_Mark_Type)
+ (Dir : String;
+ Mark : Lib_Mark_Type;
+ On_Command_Line : Boolean)
is
N : Name_Id;
B : Byte;
begin
- -- Dir last character is supposed to be a directory separator
+ if On_Command_Line then
+ declare
+ Real_Path : constant String := Normalize_Pathname (Dir);
+
+ begin
+ if Real_Path'Length = 0 then
+ Name_Len := Dir'Length;
+ Name_Buffer (1 .. Name_Len) := Dir;
+
+ else
+ Name_Len := Real_Path'Length;
+ Name_Buffer (1 .. Name_Len) := Real_Path;
+ end if;
+ end;
+
+ else
+ declare
+ Real_Path : constant String :=
+ Normalize_Pathname
+ (Dir,
+ Get_Name_String
+ (Project_Tree.Projects.Table
+ (Main_Project).Display_Directory));
+
+ begin
+ if Real_Path'Length = 0 then
+ Name_Len := Dir'Length;
+ Name_Buffer (1 .. Name_Len) := Dir;
+
+ else
+ Name_Len := Real_Path'Length;
+ Name_Buffer (1 .. Name_Len) := Real_Path;
+ end if;
+ end;
+ end if;
- Name_Len := Dir'Length;
- Name_Buffer (1 .. Name_Len) := Dir;
+ -- Last character is supposed to be a directory separator
if not Is_Directory_Separator (Name_Buffer (Name_Len)) then
Name_Len := Name_Len + 1;
Project_Tree.Projects.Table (Project).Depth := Depth;
- -- Mark the project as Seen to avoid endless loop caused by limited
- -- withs.
+ -- Mark project as Seen to avoid endless loop caused by limited withs
Project_Tree.Projects.Table (Project).Seen := True;
Project_Tree.Projects.Table (Project).Seen := False;
end Recursive_Compute_Depth;
- -----------------------
- -- Sigint_Intercpted --
- -----------------------
+ -------------------------------
+ -- Report_Compilation_Failed --
+ -------------------------------
+
+ procedure Report_Compilation_Failed is
+ begin
+ if not Debug.Debug_Flag_N then
+ Delete_Mapping_Files;
+ Prj.Env.Delete_All_Path_Files (Project_Tree);
+ end if;
+
+ Exit_Program (E_Fatal);
+ end Report_Compilation_Failed;
+
+ ------------------------
+ -- Sigint_Intercepted --
+ ------------------------
procedure Sigint_Intercepted is
+ SIGINT : constant := 2;
begin
+ Set_Standard_Error;
Write_Line ("*** Interrupted ***");
Delete_All_Temp_Files;
+
+ -- Send SIGINT to all outstanding compilation processes spawned
+
+ for J in 1 .. Outstanding_Compiles loop
+ Kill (Running_Compile (J).Pid, SIGINT, 1);
+ end loop;
+
OS_Exit (1);
end Sigint_Intercepted;
-------------------
procedure Scan_Make_Arg (Argv : String; And_Save : Boolean) is
+ Success : Boolean;
+
begin
pragma Assert (Argv'First = 1);
return;
end if;
- -- If the previous switch has set the Project_File_Name_Present
- -- flag (that is we have seen a -P alone), then the next argument is
- -- the name of the project file.
+ -- If the previous switch has set the Project_File_Name_Present flag
+ -- (that is we have seen a -P alone), then the next argument is the name
+ -- of the project file.
if Project_File_Name_Present and then Project_File_Name = null then
if Argv (1) = '-' then
Project_File_Name := new String'(Argv);
end if;
- -- If the previous switch has set the Output_File_Name_Present
- -- flag (that is we have seen a -o), then the next argument is
- -- the name of the output executable.
+ -- If the previous switch has set the Output_File_Name_Present flag
+ -- (that is we have seen a -o), then the next argument is the name of
+ -- the output executable.
elsif Output_File_Name_Present
and then not Output_File_Name_Seen
else
Add_Switch ("-o", Linker, And_Save => And_Save);
-
- -- Automatically add the executable suffix if it has not been
- -- specified explicitly.
-
- declare
- Canonical_Argv : String := Argv;
- begin
- -- Get the file name in canonical case to accept as is
- -- names ending with ".EXE" on VMS and Windows.
-
- Canonical_Case_File_Name (Canonical_Argv);
-
- if Executable_Suffix'Length /= 0
- and then (Canonical_Argv'Length <= Executable_Suffix'Length
- or else Canonical_Argv
- (Canonical_Argv'Last -
- Executable_Suffix'Length + 1
- .. Canonical_Argv'Last)
- /= Executable_Suffix)
- then
- Add_Switch
- (Argv & Executable_Suffix,
- Linker,
- And_Save => And_Save);
- else
- Add_Switch (Argv, Linker, And_Save => And_Save);
- end if;
- end;
+ Add_Switch (Executable_Name (Argv), Linker, And_Save => And_Save);
end if;
-- If the previous switch has set the Object_Directory_Present flag
- -- (that is we have seen a -D), then the next argument is
- -- the path name of the object directory..
+ -- (that is we have seen a -D), then the next argument is the path name
+ -- of the object directory..
elsif Object_Directory_Present
and then not Object_Directory_Seen
-- separator.
if Argv (Argv'Last) = Directory_Separator then
- Object_Directory_Path := new String'(Argv);
-
+ Object_Directory_Path :=
+ new String'(Argv);
else
Object_Directory_Path :=
new String'(Argv & Directory_Separator);
elsif Program_Args = Compiler then
if Argv (3 .. Argv'Last) /= "-" then
- Add_Src_Search_Dir (Argv (3 .. Argv'Last));
+ Add_Source_Search_Dir (Argv (3 .. Argv'Last), And_Save);
end if;
elsif Program_Args = Binder then
- Add_Lib_Search_Dir (Argv (3 .. Argv'Last));
+ Add_Library_Search_Dir (Argv (3 .. Argv'Last), And_Save);
end if;
end if;
(Argv (7 .. Argv'Last), Objects);
begin
- if Src_Path_Name /= null and then
- Lib_Path_Name /= null
+ if Src_Path_Name /= null
+ and then Lib_Path_Name /= null
then
- -- Set the RTS_*_Path_Name variables, so that the correct
- -- directories will be set when
- -- Osint.Add_Default_Search_Dirs will be called later.
+ -- Set RTS_*_Path_Name variables, so that correct direct-
+ -- ories will be set when Osint.Add_Default_Search_Dirs
+ -- is called later.
RTS_Src_Path_Name := Src_Path_Name;
RTS_Lib_Path_Name := Lib_Path_Name;
elsif Src_Path_Name = null
- and Lib_Path_Name = null then
+ and Lib_Path_Name = null
+ then
Make_Failed ("RTS path not valid: missing " &
"adainclude and adalib directories");
end if;
else
- Make_Failed ("unknown switch: ", Argv);
+ Scan_Make_Switches (Argv, Success);
end if;
-- If we have seen a regular switch process it
elsif Argv (1) = '-' then
-
if Argv'Length = 1 then
Make_Failed ("switch character cannot be followed by a blank");
+ -- Incorrect switches that should start with "--"
+
+ elsif (Argv'Length > 5 and then Argv (1 .. 5) = "-RTS=")
+ or else (Argv'Length > 5 and then Argv (1 .. 5) = "-GCC=")
+ or else (Argv'Length > 10 and then Argv (1 .. 10) = "-GNATLINK=")
+ or else (Argv'Length > 10 and then Argv (1 .. 10) = "-GNATBIND=")
+ then
+ Make_Failed ("option ", Argv, " should start with '--'");
+
-- -I-
elsif Argv (2 .. Argv'Last) = "I-" then
-- -Idir
elsif Argv (2) = 'I' then
- Add_Src_Search_Dir (Argv (3 .. Argv'Last));
- Add_Lib_Search_Dir (Argv (3 .. Argv'Last));
+ Add_Source_Search_Dir (Argv (3 .. Argv'Last), And_Save);
+ Add_Library_Search_Dir (Argv (3 .. Argv'Last), And_Save);
Add_Switch (Argv, Compiler, And_Save => And_Save);
Add_Switch (Argv, Binder, And_Save => And_Save);
-- -aIdir (to gcc this is like a -I switch)
elsif Argv'Length >= 3 and then Argv (2 .. 3) = "aI" then
- Add_Src_Search_Dir (Argv (4 .. Argv'Last));
+ Add_Source_Search_Dir (Argv (4 .. Argv'Last), And_Save);
Add_Switch ("-I" & Argv (4 .. Argv'Last),
Compiler,
And_Save => And_Save);
-- -aOdir
elsif Argv'Length >= 3 and then Argv (2 .. 3) = "aO" then
- Add_Lib_Search_Dir (Argv (4 .. Argv'Last));
+ Add_Library_Search_Dir (Argv (4 .. Argv'Last), And_Save);
Add_Switch (Argv, Binder, And_Save => And_Save);
-- -aLdir (to gnatbind this is like a -aO switch)
elsif Argv'Length >= 3 and then Argv (2 .. 3) = "aL" then
- Mark_Directory (Argv (4 .. Argv'Last), Ada_Lib_Dir);
- Add_Lib_Search_Dir (Argv (4 .. Argv'Last));
+ Mark_Directory (Argv (4 .. Argv'Last), Ada_Lib_Dir, And_Save);
+ Add_Library_Search_Dir (Argv (4 .. Argv'Last), And_Save);
Add_Switch ("-aO" & Argv (4 .. Argv'Last),
Binder,
And_Save => And_Save);
+ -- -aamp_target=...
+
+ elsif Argv'Length >= 13 and then Argv (2 .. 13) = "aamp_target=" then
+ Add_Switch (Argv, Compiler, And_Save => And_Save);
+
+ -- Set the aamp_target environment variable so that the binder and
+ -- linker will use the proper target library. This is consistent
+ -- with how things work when -aamp_target is passed on the command
+ -- line to gnaampmake.
+
+ Setenv ("aamp_target", Argv (14 .. Argv'Last));
+
-- -Adir (to gnatbind this is like a -aO switch, to gcc like a -I)
elsif Argv (2) = 'A' then
- Mark_Directory (Argv (3 .. Argv'Last), Ada_Lib_Dir);
- Add_Src_Search_Dir (Argv (3 .. Argv'Last));
- Add_Lib_Search_Dir (Argv (3 .. Argv'Last));
+ Mark_Directory (Argv (3 .. Argv'Last), Ada_Lib_Dir, And_Save);
+ Add_Source_Search_Dir (Argv (3 .. Argv'Last), And_Save);
+ Add_Library_Search_Dir (Argv (3 .. Argv'Last), And_Save);
Add_Switch ("-I" & Argv (3 .. Argv'Last),
Compiler,
And_Save => And_Save);
"project file");
else
- Scan_Make_Switches (Argv);
+ Scan_Make_Switches (Argv, Success);
end if;
-- -d
if Project_File_Name /= null then
Make_Failed ("-i cannot be used in conjunction with a " &
"project file");
-
else
- Scan_Make_Switches (Argv);
+ Scan_Make_Switches (Argv, Success);
end if;
-- -j (need to save the result)
elsif Argv (2) = 'j' then
- Scan_Make_Switches (Argv);
+ Scan_Make_Switches (Argv, Success);
if And_Save then
Saved_Maximum_Processes := Maximum_Processes;
Add_Switch (Argv, Compiler, And_Save => And_Save);
Add_Switch (Argv, Binder, And_Save => And_Save);
- -- By default all switches with more than one character
- -- or one character switches which are not in 'a' .. 'z'
- -- (except 'C', 'F', 'M' and 'B') are passed to the compiler,
- -- unless we are dealing with a debug switch (starts with 'd')
- -- or an extended gnatmake switch (starts with 'e').
-
- elsif Argv (2) /= 'd'
- and then Argv (2) /= 'e'
- and then Argv (2 .. Argv'Last) /= "C"
- and then Argv (2 .. Argv'Last) /= "F"
- and then Argv (2 .. Argv'Last) /= "M"
- and then Argv (2 .. Argv'Last) /= "B"
- and then (Argv'Length > 2 or else Argv (2) not in 'a' .. 'z')
- then
- Add_Switch (Argv, Compiler, And_Save => And_Save);
-
- -- All other options are handled by Scan_Make_Switches
+ -- All other switches are processed by Scan_Make_Switches.
+ -- If the call returns with Success = False, then the switch is
+ -- passed to the compiler.
else
- Scan_Make_Switches (Argv);
+ Scan_Make_Switches (Argv, Success);
+
+ if not Success then
+ Add_Switch (Argv, Compiler, And_Save => And_Save);
+ end if;
end if;
-- If not a switch it must be a file name
-----------------
function Switches_Of
- (Source_File : Name_Id;
+ (Source_File : File_Name_Type;
Source_File_Name : String;
Source_Index : Int;
Naming : Naming_Data;
begin
Switches :=
Prj.Util.Value_Of
- (Index => Source_File,
+ (Index => Name_Id (Source_File),
Src_Index => Source_Index,
In_Array => Switches_Array,
In_Tree => Project_Tree);
Name : String (1 .. Source_File_Name'Length + 3);
Last : Positive := Source_File_Name'Length;
Spec_Suffix : constant String :=
- Get_Name_String (Naming.Ada_Spec_Suffix);
+ Spec_Suffix_Of (Project_Tree, "ada", Naming);
Body_Suffix : constant String :=
- Get_Name_String (Naming.Ada_Body_Suffix);
+ Body_Suffix_Of (Project_Tree, "ada", Naming);
Truncated : Boolean := False;
begin
-----------------
procedure Verbose_Msg
- (N1 : Name_Id;
- S1 : String;
- N2 : Name_Id := No_Name;
- S2 : String := "";
- Prefix : String := " -> ")
+ (N1 : Name_Id;
+ S1 : String;
+ N2 : Name_Id := No_Name;
+ S2 : String := "";
+ Prefix : String := " -> ";
+ Minimum_Verbosity : Verbosity_Level_Type := Opt.Low)
is
begin
- if not Verbose_Mode then
+ if (not Verbose_Mode) or else (Minimum_Verbosity > Verbosity_Level) then
return;
end if;
Write_Eol;
end Verbose_Msg;
+ procedure Verbose_Msg
+ (N1 : File_Name_Type;
+ S1 : String;
+ N2 : File_Name_Type := No_File;
+ S2 : String := "";
+ Prefix : String := " -> ";
+ Minimum_Verbosity : Verbosity_Level_Type := Opt.Low)
+ is
+ begin
+ Verbose_Msg
+ (Name_Id (N1), S1, Name_Id (N2), S2, Prefix, Minimum_Verbosity);
+ end Verbose_Msg;
+
begin
-- Make sure that in case of failure, the temp files will be deleted
projects / platform / upstream / gcc.git / blobdiff