Skip to content

GitLab

Commit 5f951c1a authored by yoogx's avatar yoogx
Browse files

* Add Ocarina_Config package, holding default configurations 

          for scenario files

          For openaadl/ocarina#154
parent 59a5e2a0
Hide whitespace changes
Inline Side-by-side
resources/Makefile.am
View file @ 5f951c1a
......@@ -12,28 +12,29 @@ AADL_V1_PROPERTIES = $(srcdir)/AADLv1/aadl_properties.aadl \
$(srcdir)/AADLv1/aadl_project.aadl \
$(srcdir)/AADLv1/base_types.aadl
AADL_V2_PROPERTIES = $(srcdir)/AADLv2/aadl_project.aadl \
$(srcdir)/AADLv2/arinc653.aadl \
$(srcdir)/AADLv2/assert_types.aadl \
$(srcdir)/AADLv2/assert_properties.aadl \
$(srcdir)/AADLv2/behavior_properties.aadl \
$(srcdir)/AADLv2/deployment_properties.aadl \
$(srcdir)/AADLv2/emv2.aadl \
$(srcdir)/AADLv2/Cheddar_Properties.aadl \
$(srcdir)/AADLv2/thread_properties.aadl \
$(srcdir)/AADLv2/communication_properties.aadl \
$(srcdir)/AADLv2/memory_properties.aadl \
$(srcdir)/AADLv2/modeling_properties.aadl \
$(srcdir)/AADLv2/timing_properties.aadl \
$(srcdir)/AADLv2/pok_properties.aadl \
$(srcdir)/AADLv2/programming_properties.aadl \
$(srcdir)/AADLv2/base_types.aadl \
$(srcdir)/AADLv2/replication_properties.aadl \
$(srcdir)/AADLv2/errorlibrary.aadl \
$(srcdir)/AADLv2/taste_properties.aadl \
$(srcdir)/AADLv2/TASTE_IV_Properties.aadl \
$(srcdir)/AADLv2/TASTE_DV_Properties.aadl \
$(srcdir)/AADLv2/transformations.aadl
AADL_V2_PROPERTIES = $(srcdir)/AADLv2/aadl_project.aadl \
$(srcdir)/AADLv2/arinc653.aadl \
$(srcdir)/AADLv2/assert_types.aadl \
$(srcdir)/AADLv2/assert_properties.aadl \
$(srcdir)/AADLv2/behavior_properties.aadl \
$(srcdir)/AADLv2/deployment_properties.aadl \
$(srcdir)/AADLv2/emv2.aadl \
$(srcdir)/AADLv2/Cheddar_Properties.aadl \
$(srcdir)/AADLv2/thread_properties.aadl \
$(srcdir)/AADLv2/communication_properties.aadl \
$(srcdir)/AADLv2/memory_properties.aadl \
$(srcdir)/AADLv2/modeling_properties.aadl \
$(srcdir)/AADLv2/timing_properties.aadl \
$(srcdir)/AADLv2/pok_properties.aadl \
$(srcdir)/AADLv2/programming_properties.aadl \
$(srcdir)/AADLv2/base_types.aadl \
$(srcdir)/AADLv2/replication_properties.aadl \
$(srcdir)/AADLv2/errorlibrary.aadl \
$(srcdir)/AADLv2/taste_properties.aadl \
$(srcdir)/AADLv2/TASTE_IV_Properties.aadl \
$(srcdir)/AADLv2/TASTE_DV_Properties.aadl \
$(srcdir)/AADLv2/transformations.aadl \
$(srcdir)/AADLv2/ocarina_library.aadl
AADL_V2_COMPONENTS = $(srcdir)/AADLv2/components/*.aadl \
$(srcdir)/AADLv2/components/devices/*.aadl \
......
resources/ocarina_config.aadl
View file @ 5f951c1a
......@@ -20,7 +20,8 @@ property set Ocarina_Config is
(gprof,
ASN1);
Generator_Options : list of Ocarina_Config::Generator_Options_Type applies to (system);
Generator_Options : list of Ocarina_Config::Generator_Options_Type
applies to (system);
-- Code generation options.
AADL_Files : list of aadlstring applies to (system);
......@@ -47,6 +48,35 @@ property set Ocarina_Config is
-- set file is located in the same directory as the Ocarina
-- non-standard property sets.
Ocarina_Driver_Library : constant list of aadlstring =>
("devices.aadl",
"buses",
"base_types",
"exarm-ni-6071e-analog.aadl",
"grspw.aadl",
"rasta-serial.aadl",
"sockets-rtems-ne2000.aadl",
"exarm-ni-6071e-digital.aadl",
"gruart.aadl",
"rasta-spacewire.aadl",
"tcp_protocol.aadl",
"generic-keyboard.aadl",
"leon-eth.aadl",
"scoc3-spacewire.aadl",
"udp-exarm.aadl",
"generic_bus.aadl",
"leon-serial.aadl",
"sd-spw-usb.aadl",
"generic_native.aadl",
"native_uart.aadl",
"serial-raw.aadl",
"gr_cpci_x4cv.aadl",
"rasta-1553.aadl",
"sockets-raw.aadl",
"grspw_packet.aadl",
"apbuart.aadl",
"greth.aadl");
Root_System_Name : aadlstring applies to (system);
-- If present, indicates the name of the root of the instance tree
......
src/main/ocarina_cmd.adb
View file @ 5f951c1a
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2004-2009 Telecom ParisTech, 2010-2016 ESA & ISAE. --
-- Copyright (C) 2004-2009 Telecom ParisTech, 2010-2018 ESA & ISAE. --
-- --
-- Ocarina is free software; you can redistribute it and/or modify under --
-- terms of the GNU General Public License as published by the Free Soft- --
......@@ -309,6 +309,10 @@ procedure Ocarina_Cmd is
AADL_Root := Process_Predefined_Property_Sets (AADL_Root);
if Ocarina.AADL_Version = AADL_V2 then
Sources.Append (Get_String_Name ("ocarina_library.aadl"));
end if;
F := Sources.First;
loop
......@@ -323,16 +327,15 @@ procedure Ocarina_Cmd is
new String'(Get_Name_String (Current_Scenario_Dirname));
end if;
-- All scenario files have to be located in the same directory
Exit_On_Error
(Current_Scenario_Dirname /= Dirname,
"Cannot locate scenario files in the directory");
File_Name := Search_File (Sources.Table (F));
Exit_On_Error
((File_Name = No_Name),
"Cannot find file " & Get_Name_String (Sources.Table (F)));
Buffer := Load_File (File_Name);
if Verbose then
Write_Line ("Loading file " & Get_Name_String (Sources.Table (F)));
end if;
Exit_On_Error
((File_Name = No_Name),
"Cannot read file " & Get_Name_String (Sources.Table (F)));
......@@ -406,7 +409,7 @@ procedure Ocarina_Cmd is
Use_CL := False;
end if;
-- See what annexes are enabled foir this model. If none are
-- See what annexes are enabled for this model. If none are
-- given, assume the user want to disable them all.
if Is_Defined_List_Property (Root_System, Enable_Annexes) then
......
tests/real-annexes-parsing/test_real_parse_01.aadl.out
View file @ 5f951c1a
......@@ -258,6 +258,7 @@ property set Ocarina_Config is
Needed_Property_Sets : list of aadlstring
applies to (system);
Ocarina_Driver_Library : constant list of aadlstring => ("devices.aadl", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl", "grspw_packet.aadl", "apbuart.aadl", "greth.aadl");
Root_System_Name : aadlstring
applies to (system);
......
tests/real-annexes-parsing/test_real_parse_02.aadl.out
View file @ 5f951c1a
......@@ -258,6 +258,7 @@ property set Ocarina_Config is
Needed_Property_Sets : list of aadlstring
applies to (system);
Ocarina_Driver_Library : constant list of aadlstring => ("devices.aadl", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl", "grspw_packet.aadl", "apbuart.aadl", "greth.aadl");
Root_System_Name : aadlstring
applies to (system);
......
tests/real-annexes-parsing/test_real_parse_03.aadl.out
View file @ 5f951c1a
......@@ -258,6 +258,7 @@ property set Ocarina_Config is
Needed_Property_Sets : list of aadlstring
applies to (system);
Ocarina_Driver_Library : constant list of aadlstring => ("devices.aadl", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl", "grspw_packet.aadl", "apbuart.aadl", "greth.aadl");
Root_System_Name : aadlstring
applies to (system);
......
tests/real-annexes-parsing/test_real_parse_04.aadl.out
View file @ 5f951c1a
......@@ -258,6 +258,7 @@ property set Ocarina_Config is
Needed_Property_Sets : list of aadlstring
applies to (system);
Ocarina_Driver_Library : constant list of aadlstring => ("devices.aadl", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl", "grspw_packet.aadl", "apbuart.aadl", "greth.aadl");
Root_System_Name : aadlstring
applies to (system);
......
tests/real-annexes-parsing/test_real_parse_05.aadl.out
View file @ 5f951c1a
......@@ -258,6 +258,7 @@ property set Ocarina_Config is
Needed_Property_Sets : list of aadlstring
applies to (system);
Ocarina_Driver_Library : constant list of aadlstring => ("devices.aadl", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl", "grspw_packet.aadl", "apbuart.aadl", "greth.aadl");
Root_System_Name : aadlstring
applies to (system);
......
tests/test042/test.aadl.out
View file @ 5f951c1a
......@@ -254,6 +254,7 @@ property set Ocarina_Config is
Needed_Property_Sets : list of aadlstring
applies to (system);
Ocarina_Driver_Library : constant list of aadlstring => ("devices.aadl", "buses", "base_types", "exarm-ni-6071e-analog.aadl", "grspw.aadl", "rasta-serial.aadl", "sockets-rtems-ne2000.aadl", "exarm-ni-6071e-digital.aadl", "gruart.aadl", "rasta-spacewire.aadl", "tcp_protocol.aadl", "generic-keyboard.aadl", "leon-eth.aadl", "scoc3-spacewire.aadl", "udp-exarm.aadl", "generic_bus.aadl", "leon-serial.aadl", "sd-spw-usb.aadl", "generic_native.aadl", "native_uart.aadl", "serial-raw.aadl", "gr_cpci_x4cv.aadl", "rasta-1553.aadl", "sockets-raw.aadl", "grspw_packet.aadl", "apbuart.aadl", "greth.aadl");
Root_System_Name : aadlstring
applies to (system);
......
Markdown is supported
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