Commit c2c3343f authored by Delia Cellarier's avatar Delia Cellarier

Merged from upstream.

parents ec0ede0f f617d2d0
......@@ -5,6 +5,8 @@ CLEANFILES = config-stamp svn-commit*.tmp* *~
SUBDIRS = src support tools share include doc
DIST_SUBDIRS = $(SUBDIRS) examples
EXTRA_DIST = $(top_srcdir)/Makefile.common
check-local:: examples
examples:: install
......
################################################################################
# GNU indent configuration
# ========================
#
# -bacc : blank line around conditional compilation block
# -bad : blank line after block of declarations
# -bap : blank link after procedure body
# -bfda : break the line before all arguments in a declaration
# -nbc : no blank line after each comma in declaration
# -br : move braces closer to the if
# -brf : put braces on function definition line
# -ncdb : no comment delimiters on blank lines
# -ce : cuddle else and preceding '}'
# -ci<n> : sets the continuation indent to n
# -di<n> : put variables in column n
# -lp : line up continued lines at parentheses
# -nfc1 : do not format comments that start in column 1
# -npcs : do not put space after the function in function calls
# -npsl : put the type of a procedure on the same line as its name
# -nut : disable the use of tab
# -i2 : 2 spaces per indentation level
# -l78 : length of an output line set to 78
# -npro : ignore profile file
INDENT_FLAGS= -bacc -bad -bap -nbc -br -brf -ncdb -ce -ci2 -cli2 \
-nfc1 -npcs -npsl -nut -lp -i2 -l78 -npro -bfda
.PHONY: indent-local
indent-local:
VERSION_CONTROL=none ; for f in $(shell ls *.?); do gindent $(INDENT_FLAGS) $$f ; done
......@@ -240,10 +240,5 @@ AC_OUTPUT([
share/utils/Makefile
share/make/Makefile.common
share/make/Makefile.native
share/config/Makefile
share/config/spif-rtems/Makefile
share/config/leon-rtems/Makefile
share/config/nds-rtems/Makefile
share/config/gumstix-rtems/Makefile
support/Makefile
])
......@@ -11,7 +11,7 @@ all-local:
@echo "TO BUILD THE EXAMPLE, YOU SHOULD ISSUE '$(MAKE) build-all'"
build-all:
if test ! "$(SCENARIO_FILES)" = ""; then \
@if test ! "$(SCENARIO_FILES)" = ""; then \
$(MAKE) scenarios; \
elif test ! "$(SCENARIO_FILE)" = ""; then \
$(MAKE) scenario; \
......@@ -20,7 +20,7 @@ build-all:
fi
check-all:
if test ! "$(SCENARIO_FILES)" = ""; then \
@if test ! "$(SCENARIO_FILES)" = ""; then \
$(MAKE) scenarios-check; \
elif test ! "$(SCENARIO_FILE)" = ""; then \
$(MAKE) scenario-check; \
......@@ -34,14 +34,14 @@ check-all:
#
scenarios:
@echo "********* SCENARIO_FILES = $(SCENARIO_FILES) *********";
for sc in $(SCENARIO_FILES); do \
@echo " * Processing scenario from $(shell pwd)";
@for sc in $(SCENARIO_FILES); do \
$(MAKE) SCENARIO_FILE=$${sc} SCENARIO_FILES="" build-all || exit 1; \
done;
scenario:
@echo "********* SCENARIO_FILE = $(SCENARIO_FILE) *********";
ocarina$(EXEEXT) -b -x '${shell $(CYGPATH_W) $(SCENARIO_FILE)}';
@echo " * $(SCENARIO_FILE) $(shell pwd)";
ocarina$(EXEEXT) -aadlv2 -b -x '${shell $(CYGPATH_W) $(SCENARIO_FILE)}';
############################################################################
# Code generation and execution from AADL
......@@ -49,7 +49,7 @@ scenario:
scenarios-check:
@echo "********* SCENARIO_FILES = $(SCENARIO_FILES) *********";
for sc in $(SCENARIO_FILES); do \
@for sc in $(SCENARIO_FILES); do \
$(MAKE) SCENARIO_FILE=$${sc} SCENARIO_FILES="" check-all || exit 1; \
done;
......
-- This is a scenario file describing the AADL
-- application d3_1_3_1
package Scenario
public
with Ocarina_Config;
-- $Id: scenario_local.aadl 407 2007-06-19 15:24:28Z delange $
system d3_1_3_1
properties
system d3_1_3_1
properties
Ocarina_Config::Timeout_Property => 4000ms;
Ocarina_Config::Referencial_Files =>
("gnc_tmtc_pos", "gnc_tmtc_pos.ref");
......@@ -12,12 +11,13 @@ properties
("toy_example.aadl");
Ocarina_Config::Generator => polyorb_hi_c;
Ocarina_Config::Needed_Property_Sets =>
(value (Ocarina_Config::Data_Model),
value (Ocarina_Config::Deployment),
value (Ocarina_Config::Cheddar_Properties));
(Ocarina_Config::Data_Model,
Ocarina_Config::Deployment,
Ocarina_Config::Cheddar_Properties);
Ocarina_Config::AADL_Version => AADLv1;
end d3_1_3_1;
end d3_1_3_1;
system implementation d3_1_3_1.Impl
end d3_1_3_1.Impl;
system implementation d3_1_3_1.Impl
end d3_1_3_1.Impl;
end scenario;
-- This is a scenario file describing the AADL application Flight
-- Management
package Scenario
public
with Ocarina_Config;
-- $Id: scenario_local.aadl 424 2007-07-10 13:46:33Z zalila $
system Flight_Management
properties
system Flight_Management
properties
Ocarina_Config::Timeout_Property => 4000ms;
Ocarina_Config::Referencial_Files =>
("mgmt", "mgmt.ref");
......@@ -12,11 +11,12 @@ properties
("flt_mgmt.aadl", "software.aadl");
Ocarina_Config::Generator => polyorb_hi_c;
Ocarina_Config::Needed_Property_Sets =>
(value (Ocarina_Config::Data_Model),
value (Ocarina_Config::Deployment));
(Ocarina_Config::Data_Model,
Ocarina_Config::Deployment);
Ocarina_Config::AADL_Version => AADLv1;
end Flight_Management;
end Flight_Management;
system implementation Flight_Management.Impl
end Flight_Management.Impl;
system implementation Flight_Management.Impl
end Flight_Management.Impl;
end scenario;
system ping
properties
package Scenario
public
with Ocarina_Config;
system ping
properties
Ocarina_Config::Timeout_Property => 4000ms;
Ocarina_Config::Referencial_Files =>
("node_a", "node_a_local.ref");
......@@ -7,12 +11,13 @@ properties
("ping-local.aadl" , "software.aadl");
Ocarina_Config::Generator => polyorb_hi_c;
Ocarina_Config::Needed_Property_Sets =>
(value (Ocarina_Config::Data_Model),
value (Ocarina_Config::Deployment),
value (Ocarina_Config::Cheddar_Properties));
(Ocarina_Config::Data_Model,
Ocarina_Config::Deployment,
Ocarina_Config::Cheddar_Properties);
Ocarina_Config::AADL_Version => AADLv1;
end ping;
end ping;
system implementation ping.impl
end ping.impl;
system implementation ping.impl
end ping.impl;
end scenario;
system ping
properties
package Scenario
public
with Ocarina_Config;
system ping
properties
Ocarina_Config::Timeout_Property => 4000ms;
Ocarina_Config::Referencial_Files =>
("node_a", "node_a_impl.ref",
......@@ -8,12 +12,13 @@ properties
("ping.aadl" , "software.aadl");
Ocarina_Config::Generator => polyorb_hi_c;
Ocarina_Config::Needed_Property_Sets =>
(value (Ocarina_Config::Data_Model),
value (Ocarina_Config::Deployment),
value (Ocarina_Config::Cheddar_Properties));
(Ocarina_Config::Data_Model,
Ocarina_Config::Deployment,
Ocarina_Config::Cheddar_Properties);
Ocarina_Config::AADL_Version => AADLv1;
end ping;
end ping;
system implementation ping.impl
end ping.impl;
system implementation ping.impl
end ping.impl;
end scenario;
-- This is a scenario file describing the AADL
-- application rma
package Scenario
public
with Ocarina_Config;
-- $Id: scenario.aadl 6714 2009-06-20 21:01:32Z lanarre $
system rma
properties
system rma
properties
Ocarina_Config::Timeout_Property => 4000ms;
Ocarina_Config::Referencial_Files =>
("node_a", "node_a.ref");
......@@ -12,12 +11,13 @@ properties
("rma.aadl");
Ocarina_Config::Generator => polyorb_hi_c;
Ocarina_Config::Needed_Property_Sets =>
(value (Ocarina_Config::Data_Model),
value (Ocarina_Config::Deployment),
value (Ocarina_Config::Cheddar_Properties));
(Ocarina_Config::Data_Model,
Ocarina_Config::Deployment,
Ocarina_Config::Cheddar_Properties);
Ocarina_Config::AADL_Version => AADLv1;
end rma;
end rma;
system implementation rma.Impl
end rma.Impl;
system implementation rma.Impl
end rma.Impl;
end scenario;
-- This is a scenario file describing the AADL
-- application sunseeker
package Scenario
public
with Ocarina_Config;
-- $Id: scenario_dist.aadl 394 2007-05-31 18:59:00Z zalila $
system sunseeker
properties
system sunseeker
properties
Ocarina_Config::Timeout_Property => 4000ms;
Ocarina_Config::Referencial_Files =>
("sunseekercontroller", "sunseekercontroller_native.ref",
......@@ -13,12 +12,13 @@ properties
("sunseeker.aadl", "sunseeker_dist.aadl");
Ocarina_Config::Generator => polyorb_hi_c;
Ocarina_Config::Needed_Property_Sets =>
(value (Ocarina_Config::Data_Model),
value (Ocarina_Config::Deployment),
value (Ocarina_Config::Cheddar_Properties));
(Ocarina_Config::Data_Model,
Ocarina_Config::Deployment,
Ocarina_Config::Cheddar_Properties);
Ocarina_Config::AADL_Version => AADLv1;
end sunseeker;
end sunseeker;
system implementation sunseeker.Impl
end sunseeker.Impl;
system implementation sunseeker.Impl
end sunseeker.Impl;
end scenario;
\ No newline at end of file
-- This is a scenario file describing the AADL
-- application sunseeker
package Scenario
public
with Ocarina_Config;
-- $Id: scenario_local.aadl 394 2007-05-31 18:59:00Z zalila $
system sunseeker
properties
system sunseeker
properties
Ocarina_Config::Timeout_Property => 4000ms;
Ocarina_Config::Referencial_Files =>
("sunseeker", "sunseeker.ref");
......@@ -12,12 +11,13 @@ properties
("sunseeker.aadl", "sunseeker_local.aadl");
Ocarina_Config::Generator => polyorb_hi_c;
Ocarina_Config::Needed_Property_Sets =>
(value (Ocarina_Config::Data_Model),
value (Ocarina_Config::Deployment),
value (Ocarina_Config::Cheddar_Properties));
(Ocarina_Config::Data_Model,
Ocarina_Config::Deployment,
Ocarina_Config::Cheddar_Properties);
Ocarina_Config::AADL_Version => AADLv1;
end sunseeker;
end sunseeker;
system implementation sunseeker.Impl
end sunseeker.Impl;
system implementation sunseeker.Impl
end sunseeker.Impl;
end scenario;
system cpp
properties
package Scenario
public
with Ocarina_Config;
system cpp
properties
Ocarina_Config::AADL_Files =>
("cpp_test.aadl");
Ocarina_Config::Generator => polyorb_hi_c;
Ocarina_Config::Root_System_Name => "cpp_test.impl";
Ocarina_Config::Needed_Property_Sets =>
(value (Ocarina_Config::Data_Model),
value (Ocarina_Config::Deployment),
value (Ocarina_Config::Cheddar_Properties));
(Ocarina_Config::Data_Model,
Ocarina_Config::Deployment,
Ocarina_Config::Cheddar_Properties);
Ocarina_Config::AADL_Version => AADLv2;
end cpp;
end cpp;
system implementation cpp.Impl
end cpp.Impl;
system implementation cpp.Impl
end cpp.Impl;
end scenario;
\ No newline at end of file
-- This is a scenario file describing the AADL application Flight
-- Management
package Scenario
public
with Ocarina_Config;
-- $Id: scenario_local.aadl 424 2007-07-10 13:46:33Z zalila $
system cpptest
properties
system cpptest
properties
Ocarina_Config::Timeout_Property => 1000ms;
Ocarina_Config::Referencial_Files =>
("cpptest", "cpptest.ref");
Ocarina_Config::AADL_Files =>
("cpp_test.aadl", "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");
("cpp_test.aadl");
Ocarina_Config::Root_System_Name => "cpp_test.RTEMS";
Ocarina_Config::Generator => polyorb_hi_c;
Ocarina_Config::Needed_Property_Sets =>
(value (Ocarina_Config::Data_Model),
value (Ocarina_Config::Deployment),
value (Ocarina_Config::Cheddar_Properties));
(Ocarina_Config::Data_Model,
Ocarina_Config::Deployment,
Ocarina_Config::Cheddar_Properties);
Ocarina_Config::AADL_Version => AADLv2;
end cpptest;
end cpptest;
system implementation cpptest.Impl
end cpptest.Impl;
system implementation cpptest.Impl
end cpptest.Impl;
end scenario;
\ No newline at end of file
-- This is a scenario file describing the AADL
-- application d3_1_3_1
package scenario
public
with Ocarina_Config;
-- $Id: scenario_local.aadl 407 2007-06-19 15:24:28Z delange $
system d3_1_3_1
properties
system d3_1_3_1
properties
Ocarina_Config::Timeout_Property => 4000ms;
Ocarina_Config::Referencial_Files =>
("gnc_tmtc_pos", "gnc_tmtc_pos.ref");
......@@ -13,11 +12,13 @@ properties
Ocarina_Config::Root_System_Name => "toy_example.native";
Ocarina_Config::Generator => polyorb_hi_c;
Ocarina_Config::Needed_Property_Sets =>
(value (Ocarina_Config::Data_Model),
value (Ocarina_Config::Deployment),
value (Ocarina_Config::Cheddar_Properties));
(Ocarina_Config::Data_Model,
Ocarina_Config::Deployment,
Ocarina_Config::Cheddar_Properties);
Ocarina_Config::AADL_Version => AADLv2;
end d3_1_3_1;
end d3_1_3_1;
system implementation d3_1_3_1.Impl
end d3_1_3_1.Impl;
system implementation d3_1_3_1.Impl
end d3_1_3_1.Impl;
end scenario;
\ No newline at end of file
-- This is a scenario file describing the AADL
-- application d3_1_3_1
package scenario
public
with Ocarina_Config;
-- $Id: scenario_local.aadl 407 2007-06-19 15:24:28Z delange $
system d3_1_3_1
properties
system d3_1_3_1
properties
Ocarina_Config::Timeout_Property => 4000ms;
Ocarina_Config::Referencial_Files =>
("gnc_tmtc_pos", "gnc_tmtc_pos.ref");
......@@ -12,12 +11,13 @@ properties
Ocarina_Config::Root_System_Name => "toy_example.xenomai";
Ocarina_Config::Generator => polyorb_hi_c;
Ocarina_Config::Needed_Property_Sets =>
(value (Ocarina_Config::Data_Model),
value (Ocarina_Config::Deployment),
value (Ocarina_Config::ARINC653_Properties),
value (Ocarina_Config::Cheddar_Properties));
(Ocarina_Config::Data_Model,
Ocarina_Config::Deployment,
Ocarina_Config::Cheddar_Properties);
Ocarina_Config::AADL_Version => AADLv2;
end d3_1_3_1;
end d3_1_3_1;
system implementation d3_1_3_1.Impl
end d3_1_3_1.Impl;
system implementation d3_1_3_1.Impl
end d3_1_3_1.Impl;
end scenario;
\ No newline at end of file
-- This is a scenario file describing the AADL
-- application d3_1_3_1
package scenario
public
with Ocarina_Config;
-- $Id: scenario_local.aadl 407 2007-06-19 15:24:28Z delange $
system d3_1_3_1
properties
system d3_1_3_1
properties
Ocarina_Config::Timeout_Property => 4000ms;
Ocarina_Config::Referencial_Files =>
("gnc_tmtc_pos", "gnc_tmtc_pos.ref");
......@@ -13,12 +12,13 @@ properties
Ocarina_Config::Root_System_Name => "toy_example.xenomai_posix";
Ocarina_Config::Generator => polyorb_hi_c;
Ocarina_Config::Needed_Property_Sets =>
(value (Ocarina_Config::Data_Model),
value (Ocarina_Config::Deployment),
value (Ocarina_Config::ARINC653_Properties),
value (Ocarina_Config::Cheddar_Properties));
(Ocarina_Config::Data_Model,
Ocarina_Config::Deployment,
Ocarina_Config::Cheddar_Properties);
Ocarina_Config::AADL_Version => AADLv2;
end d3_1_3_1;
end d3_1_3_1;
system implementation d3_1_3_1.Impl
end d3_1_3_1.Impl;
system implementation d3_1_3_1.Impl
end d3_1_3_1.Impl;
end scenario;
\ No newline at end of file
-- This is a scenario file describing the AADL
-- application d3_1_3_1
package scenario
public
with Ocarina_Config;
-- $Id: scenario_local.aadl 407 2007-06-19 15:24:28Z delange $
system d3_1_3_1
properties
system d3_1_3_1
properties
Ocarina_Config::Timeout_Property => 4000ms;
Ocarina_Config::Referencial_Files =>
("gnc_tmtc_pos", "gnc_tmtc_pos.ref");
......@@ -13,11 +12,13 @@ properties
Ocarina_Config::Root_System_Name => "toy_example.RTEMS";
Ocarina_Config::Generator => polyorb_hi_c;
Ocarina_Config::Needed_Property_Sets =>
(value (Ocarina_Config::Data_Model),
value (Ocarina_Config::Deployment),
value (Ocarina_Config::Cheddar_Properties));
(Ocarina_Config::Data_Model,
Ocarina_Config::Deployment,
Ocarina_Config::Cheddar_Properties);
Ocarina_Config::AADL_Version => AADLv2;
end d3_1_3_1;
end d3_1_3_1;
system implementation d3_1_3_1.Impl
end d3_1_3_1.Impl;
system implementation d3_1_3_1.Impl
end d3_1_3_1.Impl;
end scenario;
\ No newline at end of file
system ping
properties
Ocarina_Config::Timeout_Property => 4000ms;
package Scenario
public
with Ocarina_Config;
with Ocarina_Library;
system ping extends Ocarina_Library::Default_PolyORB_HI_C_Config
properties
Ocarina_Config::Referencial_Files =>
("node_a", "node_a.ref",
"node_b", "node_b.ref");
Ocarina_Config::AADL_Files =>
("ping.aadl" , "software.aadl",
"devices", "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");
Ocarina_Config::AADL_Files +=>
("ping.aadl" , "software.aadl");
Ocarina_Config::Root_System_Name => "PING.impl";
Ocarina_Config::Generator => polyorb_hi_c;
Ocarina_Config::Needed_Property_Sets =>
(value (Ocarina_Config::Data_Model),
value (Ocarina_Config::ARINC653_Properties),
value (Ocarina_Config::Deployment),
value (Ocarina_Config::Cheddar_Properties));
Ocarina_Config::AADL_Version => AADLv2;
end ping;
end ping;
system implementation ping.impl
end ping.impl;
system implementation ping.impl
end ping.impl;
end scenario;
\ No newline at end of file
system ping
properties
Ocarina_Config::Timeout_Property => 4000ms;
package Scenario
public
with Ocarina_Config;
with Ocarina_Library;
system ping extends Ocarina_Library::Default_PolyORB_HI_C_Config
properties
Ocarina_Config::Referencial_Files =>
("node_a", "node_a.ref");
Ocarina_Config::AADL_Files =>
("ping.aadl" , "software.aadl",
"devices", "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");
Ocarina_Config::AADL_Files +=>
("ping.aadl" , "software.aadl");
Ocarina_Config::Root_System_Name => "PING.local";
Ocarina_Config::Generator => polyorb_hi_c;
Ocarina_Config::Needed_Property_Sets =>
(value (Ocarina_Config::Data_Model),
value (Ocarina_Config::Deployment),
value (Ocarina_Config::Cheddar_Properties));
Ocarina_Config::AADL_Version => AADLv2;
end ping;
end ping;
system implementation ping.impl
end ping.impl;
system implementation ping.impl
end ping.impl;
end scenario;
\ No newline at end of file
system ping
properties
Ocarina_Config::Timeout_Property => 4000ms;
package Scenario
public
with Ocarina_Config;
with Ocarina_Library;
system ping extends Ocarina_Library::Default_PolyORB_HI_C_Config
properties
Ocarina_Config::Referencial_Files =>
("node_a", "node_a.ref");
Ocarina_Config::AADL_Files =>