OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clean.adb (Gnatclean): Fail if main project is an aggregate project or if...

Browse Source 
2014-01-29  Vincent Celier  <celier@adacore.com>

	* clean.adb (Gnatclean): Fail if main project is an aggregate
	project or if there is an aggregate library project in the
	project tree.
	* gnatcmd.adb: Fail if the main project is an aggregate project
	or if there is an aggegate library project in the project tree.
	* make.adb (Initialize): : Fail if main project is an aggregate
	project or if there is an aggregate library project in the
	project tree.
	* makeutl.ads (Aggregate_Libraries_In): New Boolean function.
	* prj-makr.adb (Initialize): Fail if the main project is an
	aggregate project or an aggregate library project.

From-SVN: r207255
This commit is contained in:
Vincent Celier 2014-01-29 15:36:37 +00:00 committed by Arnaud Charlet
parent 88de755d13
commit 35d4d8995a
7 changed files with 66 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gcc/ada/ChangeLog
View File

@ -1,3 +1,17 @@
2014-01-29 Vincent Celier <celier@adacore.com>
* clean.adb (Gnatclean): Fail if main project is an aggregate
project or if there is an aggregate library project in the
project tree.
* gnatcmd.adb: Fail if the main project is an aggregate project
or if there is an aggegate library project in the project tree.
* make.adb (Initialize): : Fail if main project is an aggregate
project or if there is an aggregate library project in the
project tree.
* makeutl.ads (Aggregate_Libraries_In): New Boolean function.
* prj-makr.adb (Initialize): Fail if the main project is an
aggregate project or an aggregate library project.
2014-01-29 Vincent Celier <celier@adacore.com>
* prj-part.adb (Check_Import_Aggregate): New procedure

6
gcc/ada/clean.adb
View File

@ -1416,6 +1416,12 @@ package body Clean is
if Main_Project = No_Project then
Fail ("""" & Project_File_Name.all & """ processing failed");
elsif Main_Project.Qualifier = Aggregate then
Fail ("aggregate projects are not supported");
elsif Aggregate_Libraries_In (Project_Tree) then
Fail ("aggregate library projects are not supported");
end if;
if Opt.Verbose_Mode then

6
gcc/ada/gnatcmd.adb
View File

@ -1939,6 +1939,12 @@ begin
if Project = Prj.No_Project then
Fail ("""" & Project_File.all & """ processing failed");
elsif Project.Qualifier = Aggregate then
Fail ("aggregate projects are not supported");
elsif Aggregate_Libraries_In (Project_Tree) then
Fail ("aggregate library projects are not supported");
end if;
-- Check if a package with the name of the tool is in the project

7
gcc/ada/make.adb
View File

@ -6617,6 +6617,13 @@ package body Make is
("""" & Project_File_Name.all & """ processing failed");
end if;
if Main_Project.Qualifier = Aggregate then
Make_Failed ("aggregate projects are not supported");
elsif Aggregate_Libraries_In (Project_Tree) then
Make_Failed ("aggregate library projects are not supported");
end if;
Create_Mapping_File := True;
if Verbose_Mode then

20
gcc/ada/makeutl.adb
View File

@ -171,6 +171,26 @@ package body Makeutl is
end;
end Absolute_Path;
----------------------------
-- Aggregate_Libraries_In --
----------------------------
function Aggregate_Libraries_In (Tree : Project_Tree_Ref) return Boolean is
List : Project_List;
begin
List := Tree.Projects;
while List /= null loop
if List.Project.Qualifier = Aggregate_Library then
return True;
end if;
List := List.Next;
end loop;
return False;
end Aggregate_Libraries_In;
-------------------------
-- Base_Name_Index_For --
-------------------------

6
gcc/ada/makeutl.ads
View File

@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
-- Copyright (C) 2004-2012, Free Software Foundation, Inc. --
-- Copyright (C) 2004-2013, 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- --
@ -216,6 +216,10 @@ package Makeutl is
-- The source directories of imported projects are only included if one
-- of the declared languages is in the list Languages.
function Aggregate_Libraries_In (Tree : Project_Tree_Ref) return Boolean;
-- Return True iff there is one or more aggregate library projects in
-- the project tree Tree.
procedure Write_Path_File (FD : File_Descriptor);
-- Write in the specified open path file the directories in table
-- Directories, then closed the path file.

8
gcc/ada/prj-makr.adb
View File

@ -889,6 +889,14 @@ package body Prj.Makr is
if No (Project_Node) then
Prj.Com.Fail ("parsing of existing project file failed");
elsif Project_Qualifier_Of (Project_Node, Tree) = Aggregate then
Prj.Com.Fail ("aggregate projects are not supported");
elsif Project_Qualifier_Of (Project_Node, Tree) =
Aggregate_Library
then
Prj.Com.Fail ("aggregate library projects are not supported");
else
-- If parsing was successful, remove the components that are
-- automatically generated, if any, so that they will be