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

prj-conf.adb (Get_Or_Create_Configuration_File): Never parse a config project file if On_Load_Config is not null.

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

	* prj-conf.adb (Get_Or_Create_Configuration_File): Never parse
	a config project file if On_Load_Config is not null.
	* prj-pars.adb: Minor comment changes.

From-SVN: r206984
This commit is contained in:
Vincent Celier 2014-01-23 16:39:02 +00:00 committed by Arnaud Charlet
parent bdd6d80ab5
commit 225a0c5c56
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ada/ChangeLog
View File

@ -1,3 +1,9 @@
2014-01-23 Vincent Celier <celier@adacore.com>
* prj-conf.adb (Get_Or_Create_Configuration_File): Never parse
a config project file if On_Load_Config is not null.
* prj-pars.adb: Minor comment changes.
2014-01-23 Ed Schonberg <schonberg@adacore.com>
* lib-xref.adb (Output_References): Output progenitors of

9
gcc/ada/prj-conf.adb
View File

@ -1420,12 +1420,17 @@ package body Prj.Conf is
-- Parse the configuration file
if Verbose_Mode and then Config_File_Path /= null then
if Verbose_Mode
and then Config_File_Path /= null
and then On_Load_Config = null
then
Write_Str ("Checking configuration ");
Write_Line (Config_File_Path.all);
end if;
if Config_File_Path /= null then
-- Add comment for On_Load_Config test ???
if Config_File_Path /= null and then On_Load_Config = null then
Prj.Part.Parse
(In_Tree => Project_Node_Tree,
Project => Config_Project_Node,

3
gcc/ada/prj-pars.adb
View File

@ -83,9 +83,6 @@ package body Prj.Pars is
-- However, we will simulate one that only contains the default
-- GNAT naming scheme.
-- We pass an invalid config_file_name, to prevent reading a
-- default.cgpr that might happen to be in the current directory.
Process_Project_And_Apply_Config
(Main_Project => The_Project,
User_Project_Node => Project_Node,