[multiple changes]

2013-01-04  Pascal Obry  <obry@adacore.com>

	* prj-nmsc.adb: Minor reformatting.

2013-01-04  Vincent Celier  <celier@adacore.com>

	* makeutl.ads (Root_Environment): New variable, moved rom
	gprbuild (Load_Standard_Base): New Boolean variable, moved
	from gprbuild.
	* prj-conf.adb (Check_Builder_Switches): New procedure to check
	for switch --RTS in package Builder. If a runtime specified
	by --RTS is a relative path name, but not a base name, then
	find the path on the Project Search Path.
	(Do_Autoconf): Call Check_Builder_Switches.
	(Locate_Runtime): New procedure, moved from gprbuild, to get the
	absolute paths of runtimes when they are not specified as a base name.
	* prj-conf.ads (Locate_Runtime): New procedure, moved from gprbuild.

From-SVN: r194893

gcc/ada/ChangeLog

+2013-01-04  Pascal Obry  <obry@adacore.com>
+
+	* prj-nmsc.adb: Minor reformatting.
+
+2013-01-04  Vincent Celier  <celier@adacore.com>
+
+	* makeutl.ads (Root_Environment): New variable, moved rom
+	gprbuild (Load_Standard_Base): New Boolean variable, moved
+	from gprbuild.
+	* prj-conf.adb (Check_Builder_Switches): New procedure to check
+	for switch --RTS in package Builder. If a runtime specified
+	by --RTS is a relative path name, but not a base name, then
+	find the path on the Project Search Path.
+	(Do_Autoconf): Call Check_Builder_Switches.
+	(Locate_Runtime): New procedure, moved from gprbuild, to get the
+	absolute paths of runtimes when they are not specified as a base name.
+	* prj-conf.ads (Locate_Runtime): New procedure, moved from gprbuild.
+
 2013-01-04  Ed Schonberg  <schonberg@adacore.com>
 
 	* sem_ch3.adb (Build_Private_Derived_Type): Set

gcc/ada/makeutl.ads

@@ -44,6 +44,14 @@ package Makeutl is
    type Fail_Proc is access procedure (S : String);
    --  Pointer to procedure which outputs a failure message
 
+   Root_Environment : Prj.Tree.Environment;
+   --  The environment coming from environment variables and command line
+   --  switches. When we do not have an aggregate project, this is used for
+   --  parsing the project tree. When we have an aggregate project, this is
+   --  used to parse the aggregate project; the latter then generates another
+   --  environment (with additional external values and project path) to parse
+   --  the aggregated projects.
+
    Default_Config_Name : constant String := "default.cgpr";
    --  Name of the configuration file used by gprbuild and generated by
    --  gprconfig by default.
@@ -71,6 +79,9 @@ package Makeutl is
    Create_Map_File_Switch : constant String := "--create-map-file";
    --  Switch to create a map file when an executable is linked
 
+   Load_Standard_Base : Boolean := True;
+   --  False when gprbuild is called with --db-
+
    package Directories is new Table.Table
      (Table_Component_Type => Path_Name_Type,
       Table_Index_Type     => Integer,

gcc/ada/prj-conf.ads

@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---            Copyright (C) 2006-2011, Free Software Foundation, Inc.       --
+--            Copyright (C) 2006-2012, Free Software Foundation, Inc.       --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -189,4 +189,12 @@ package Prj.Conf is
    function Runtime_Name_Set_For (Language : Name_Id) return Boolean;
    --  Returns True only if Set_Runtime_For has been called for the Language
 
+   procedure Locate_Runtime
+     (Language     : Name_Id;
+      Project_Tree : Prj.Project_Tree_Ref);
+   --  If RTS_Name is a base name (a name without path separator), then
+   --  do nothing. Otherwise, convert it to an absolute path (possibly by
+   --  searching it in the project path) and call Set_Runtime_For with the
+   --  absolute path. Fail the program if the path does not exist.
+
 end Prj.Conf;

gcc/ada/prj-nmsc.adb

@@ -6727,9 +6727,9 @@ package body Prj.Nmsc is
 
    procedure Free (Data : in out Project_Processing_Data) is
    begin
-      Source_Names_Htable.Reset      (Data.Source_Names);
-      Unit_Exceptions_Htable.Reset   (Data.Unit_Exceptions);
-      Excluded_Sources_Htable.Reset  (Data.Excluded);
+      Source_Names_Htable.Reset     (Data.Source_Names);
+      Unit_Exceptions_Htable.Reset  (Data.Unit_Exceptions);
+      Excluded_Sources_Htable.Reset (Data.Excluded);
    end Free;
 
    -------------------------------
@@ -6996,9 +6996,9 @@ package body Prj.Nmsc is
 
                if Name_Loc.Source.Naming_Exception = Inherited then
                   declare
-                     Proj  : Project_Id := Name_Loc.Source.Project.Extends;
-                     Iter  : Source_Iterator;
-                     Src   : Source_Id;
+                     Proj : Project_Id := Name_Loc.Source.Project.Extends;
+                     Iter : Source_Iterator;
+                     Src  : Source_Id;
                   begin
                      while Proj /= No_Project loop
                         Iter := For_Each_Source (Data.Tree, Proj);
@@ -7149,10 +7149,10 @@ package body Prj.Nmsc is
         (Path : Path_Information;
          Rank : Natural) return Boolean
       is
-         Dir   : Dir_Type;
-         Name  : String (1 .. 250);
-         Last  : Natural;
-         Found : Path_Information;
+         Dir     : Dir_Type;
+         Name    : String (1 .. 250);
+         Last    : Natural;
+         Found   : Path_Information;
          Success : Boolean := False;
 
       begin
@@ -7198,10 +7198,10 @@ package body Prj.Nmsc is
          Rank : Natural) return Boolean
       is
          Path_Str : constant String := Get_Name_String (Path.Display_Name);
-         Dir   : Dir_Type;
-         Name  : String (1 .. 250);
-         Last  : Natural;
-         Success : Boolean := False;
+         Dir      : Dir_Type;
+         Name     : String (1 .. 250);
+         Last     : Natural;
+         Success  : Boolean := False;
 
       begin
          Debug_Output ("looking for subdirs of ", Name_Id (Path.Display_Name));
@@ -8321,9 +8321,7 @@ package body Prj.Nmsc is
             procedure Check_Not_Defined (Name : Name_Id) is
                Var : constant Prj.Variable_Value :=
                        Prj.Util.Value_Of
-                         (Name,
-                          Project.Decl.Attributes,
-                          Data.Tree.Shared);
+                         (Name, Project.Decl.Attributes, Data.Tree.Shared);
             begin
                if not Var.Default then
                   Error_Msg_Name_1 := Name;