+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
-- 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,
-- 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,