Applying Jerome's patch.

ada/buildsupport.adb

@@ -11,8 +11,8 @@ with Ada.Strings.Unbounded,
      GNAT.OS_Lib,
      Errors,
      Locations,
-     Namet,
-     Types,
+     Ocarina.Namet,
+     Ocarina.Types,
      System.Assertions,
      Ocarina.Analyzer,
      Ocarina.Backends.Properties,
@@ -36,8 +36,8 @@ use Ada.Strings.Unbounded,
     Ada.Text_IO,
     Ada.Characters.Handling,
     Locations,
-    Namet,
-    Types,
+    Ocarina.Namet,
+    Ocarina.Types,
     Ocarina,
     Ocarina.Analyzer,
     Ocarina.Backends.Properties,
@@ -801,7 +801,7 @@ procedure BuildSupport is
                   "programming_properties.aadl" &
                   "memory_properties.aadl" &
                   "modeling_properties.aadl" &
-                  "arinc653_properties.aadl" &
+                  "arinc653.aadl" &
                   "base_types.aadl" &
                   "data_model.aadl" &
                   "deployment.aadl";
@@ -1416,7 +1416,7 @@ procedure BuildSupport is
       Ocarina.AADL_Version := AADL_Version;
 
       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;
       AADL_Language := Get_String_Name ("aadl");
 

ada/buildsupport_utils.adb

@@ -5,7 +5,7 @@
 with Ada.Text_IO;
 with GNAT.OS_Lib;
 
-with Namet;
+with Ocarina.Namet;
 with Ocarina.Configuration;
 with Ocarina.AADL_Values;
 with Ocarina.Instances.Queries;
@@ -19,7 +19,7 @@ package body Buildsupport_Utils is
    use Ada.Text_IO;
    use GNAT.OS_Lib;
 
-   use Namet;
+   use Ocarina.Namet;
    use Ocarina.Instances.Queries;
    use Ocarina.ME_AADL.AADL_Instances.Nodes;
    use Ocarina.ME_AADL.AADL_Instances.Nutils;
@@ -37,8 +37,8 @@ package body Buildsupport_Utils is
         "buildsupport - contact: Maxime.Perrotin@esa.int or "
         & "Thanassis.Tsiodras@esa.int "
         & ASCII.LF & ASCII.CR
-        & "Based on Ocarina: " & Ocarina.Configuration.Ocarina_Version
-        & " (" & Ocarina.Configuration.Ocarina_SVN_Revision & ")";
+        & "Based on Ocarina: " & Ocarina.Configuration.Ocarina_Version;
+--        & " (" & Ocarina.Configuration.Ocarina_SVN_Revision & ")";
    begin
       Put_Line (The_Banner);
    end Banner;

ada/buildsupport_utils.ads

@@ -4,7 +4,7 @@
 
 --  Set of helper functions for buildsupport
 with Ocarina,
-     Types,
+     Ocarina.Types,
      Ada.Containers.Indefinite_Ordered_Maps;
 
 use Ocarina,
@@ -12,7 +12,7 @@ use Ocarina,
 
 package Buildsupport_Utils is
 
-   use Types;
+   use Ocarina.Types;
 
    procedure Banner;
 

ada/imported_routines.ads

@@ -2,7 +2,7 @@
 --  (c) 2015 European Space Agency - maxime.perrotin@esa.int
 --  LGPL license, see LICENSE file
 
-with Types; use Types;
+with Ocarina.Types; use Ocarina.Types;
 
 package Imported_Routines is