2011-08-04 Emmanuel Briot <briot@adacore.com>

	* prj.adb, prj.ads, makeutl.adb, makeutl.ads, prj-env.adb
	(Project_Tree_Appdata): New type.
	It is now possible to associate application-specific data to a project
	tree. In particular, this is used in the gprbuild builder to avoid a
	number of global tables and htables, especially now that there can be
	several project trees loaded at once because of aggregate projects.
	(Debug_Name): new procedure.
	* projects.texi: Clarify syntax of "**" for Source_Dirs



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@177315 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 7 insertions, 1 deletions

diff --git a/gcc/ada/prj-env.adb b/gcc/ada/prj-env.adb
index 58f1ec8c57f..e91bf61e281 100644
--- a/gcc/ada/prj-env.adb
+++ b/gcc/ada/prj-env.adb
@@ -829,6 +829,7 @@ package body Prj.Env is
          Iter   : Source_Iterator;
 
       begin
+         Debug_Output ("Add mapping for project", Project.Name);
          Iter := For_Each_Source (In_Tree, Project, Language => Language);
 
          loop
@@ -901,13 +902,18 @@ package body Prj.Env is
    --  Start of processing for Create_Mapping_File
 
    begin
+      if Current_Verbosity = High then
+         Debug_Output ("Create mapping file for", Debug_Name (In_Tree));
+      end if;
+
       Create_Temp_File (In_Tree.Shared, File, Name, "mapping");
 
       if Current_Verbosity = High then
          Debug_Increase_Indent ("Create mapping file ", Name_Id (Name));
       end if;
 
-      For_Every_Imported_Project (Project, In_Tree, Dummy);
+      For_Every_Imported_Project
+        (Project, In_Tree, Dummy, Include_Aggregated => False);
 
       declare
          Last   : Natural;