Commit 6fc1e632 authored by Thanassis Tsiodras's avatar Thanassis Tsiodras
Browse files

Applying Jerome's patch.

parent 02d7f3e9
...@@ -11,8 +11,8 @@ with Ada.Strings.Unbounded, ...@@ -11,8 +11,8 @@ with Ada.Strings.Unbounded,
GNAT.OS_Lib, GNAT.OS_Lib,
Errors, Errors,
Locations, Locations,
Namet, Ocarina.Namet,
Types, Ocarina.Types,
System.Assertions, System.Assertions,
Ocarina.Analyzer, Ocarina.Analyzer,
Ocarina.Backends.Properties, Ocarina.Backends.Properties,
...@@ -36,8 +36,8 @@ use Ada.Strings.Unbounded, ...@@ -36,8 +36,8 @@ use Ada.Strings.Unbounded,
Ada.Text_IO, Ada.Text_IO,
Ada.Characters.Handling, Ada.Characters.Handling,
Locations, Locations,
Namet, Ocarina.Namet,
Types, Ocarina.Types,
Ocarina, Ocarina,
Ocarina.Analyzer, Ocarina.Analyzer,
Ocarina.Backends.Properties, Ocarina.Backends.Properties,
...@@ -801,7 +801,7 @@ procedure BuildSupport is ...@@ -801,7 +801,7 @@ procedure BuildSupport is
"programming_properties.aadl" & "programming_properties.aadl" &
"memory_properties.aadl" & "memory_properties.aadl" &
"modeling_properties.aadl" & "modeling_properties.aadl" &
"arinc653_properties.aadl" & "arinc653.aadl" &
"base_types.aadl" & "base_types.aadl" &
"data_model.aadl" & "data_model.aadl" &
"deployment.aadl"; "deployment.aadl";
...@@ -1416,7 +1416,7 @@ procedure BuildSupport is ...@@ -1416,7 +1416,7 @@ procedure BuildSupport is
Ocarina.AADL_Version := AADL_Version; Ocarina.AADL_Version := AADL_Version;
Ocarina.Configuration.Init_Modules; Ocarina.Configuration.Init_Modules;
Ocarina.FE_AADL.Parser.First_Parsing := True; -- Ocarina.FE_AADL.Parser.First_Parsing := True;
Ocarina.FE_AADL.Parser.Add_Pre_Prop_Sets := True; Ocarina.FE_AADL.Parser.Add_Pre_Prop_Sets := True;
AADL_Language := Get_String_Name ("aadl"); AADL_Language := Get_String_Name ("aadl");
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
with Ada.Text_IO; with Ada.Text_IO;
with GNAT.OS_Lib; with GNAT.OS_Lib;
with Namet; with Ocarina.Namet;
with Ocarina.Configuration; with Ocarina.Configuration;
with Ocarina.AADL_Values; with Ocarina.AADL_Values;
with Ocarina.Instances.Queries; with Ocarina.Instances.Queries;
...@@ -19,7 +19,7 @@ package body Buildsupport_Utils is ...@@ -19,7 +19,7 @@ package body Buildsupport_Utils is
use Ada.Text_IO; use Ada.Text_IO;
use GNAT.OS_Lib; use GNAT.OS_Lib;
use Namet; use Ocarina.Namet;
use Ocarina.Instances.Queries; use Ocarina.Instances.Queries;
use Ocarina.ME_AADL.AADL_Instances.Nodes; use Ocarina.ME_AADL.AADL_Instances.Nodes;
use Ocarina.ME_AADL.AADL_Instances.Nutils; use Ocarina.ME_AADL.AADL_Instances.Nutils;
...@@ -37,8 +37,8 @@ package body Buildsupport_Utils is ...@@ -37,8 +37,8 @@ package body Buildsupport_Utils is
"buildsupport - contact: Maxime.Perrotin@esa.int or " "buildsupport - contact: Maxime.Perrotin@esa.int or "
& "Thanassis.Tsiodras@esa.int " & "Thanassis.Tsiodras@esa.int "
& ASCII.LF & ASCII.CR & ASCII.LF & ASCII.CR
& "Based on Ocarina: " & Ocarina.Configuration.Ocarina_Version & "Based on Ocarina: " & Ocarina.Configuration.Ocarina_Version;
& " (" & Ocarina.Configuration.Ocarina_SVN_Revision & ")"; -- & " (" & Ocarina.Configuration.Ocarina_SVN_Revision & ")";
begin begin
Put_Line (The_Banner); Put_Line (The_Banner);
end Banner; end Banner;
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
-- Set of helper functions for buildsupport -- Set of helper functions for buildsupport
with Ocarina, with Ocarina,
Types, Ocarina.Types,
Ada.Containers.Indefinite_Ordered_Maps; Ada.Containers.Indefinite_Ordered_Maps;
use Ocarina, use Ocarina,
...@@ -12,7 +12,7 @@ use Ocarina, ...@@ -12,7 +12,7 @@ use Ocarina,
package Buildsupport_Utils is package Buildsupport_Utils is
use Types; use Ocarina.Types;
procedure Banner; procedure Banner;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
-- (c) 2015 European Space Agency - maxime.perrotin@esa.int -- (c) 2015 European Space Agency - maxime.perrotin@esa.int
-- LGPL license, see LICENSE file -- LGPL license, see LICENSE file
with Types; use Types; with Ocarina.Types; use Ocarina.Types;
package Imported_Routines is package Imported_Routines is
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment