* Merge compcert example with main example

examples/aadlv2/rma/Makefile.am

 C_FILES = $(srcdir)/hello.c
 AADL_FILES = $(srcdir)/rma.aadl \
-             $(srcdir)/rma-xenomai-posix.aadl \
-             $(srcdir)/rma-compcert.aadl \
-             $(srcdir)/rma-bench.aadl \
-             $(srcdir)/rma-xenomai-native.aadl
-
+	     $(srcdir)/rma-xenomai-posix.aadl \
+	     $(srcdir)/rma-bench.aadl \
+	     $(srcdir)/rma-xenomai-native.aadl
 
 SCENARIO_FILES = $(srcdir)/scenario.aadl			\
-                  $(srcdir)/scenario-compcert.aadl		\
-                  $(srcdir)/scenario-xenomai-native.aadl	\
-                  $(srcdir)/scenario-xenomai-posix.aadl		\
-                  $(srcdir)/scenario-rtems.aadl
+		  $(srcdir)/scenario-compcert.aadl		\
+		  $(srcdir)/scenario-xenomai-native.aadl	\
+		  $(srcdir)/scenario-xenomai-posix.aadl		\
+		  $(srcdir)/scenario-rtems.aadl
 
 # remove target, linux specific
 #                  $(srcdir)/scenario-bench.aadl
@@ -20,4 +18,3 @@ include $(srcdir)/../../Makefile.common
 EXTRA_DIST = $(AADL_FILES) $(SCENARIO_FILES) $(C_FILES)
 
 CLEANDIRS = rma_impl rma_rtems
-

examples/aadlv2/rma/rma-compcert.aadl

---  This AADL model illustrates how to conduct schedulability analysis
---  using Cheddar, and then code generation of periodic tasks.
---
---  Two periodic tasks run in parrallel, without interaction. Tasks
---  parameters allows RMA analysis
---
---  $Id: rma.aadl 370 2007-04-23 14:54:41Z hugues $
-
-package RMAAadl
-public
-  with Deployment;
-
------------------
--- Subprograms --
------------------
-
-subprogram Hello_Spg_1
-properties
-  source_language => C;
-  source_name     => "user_Hello_Spg_1";
-  source_text     => ("hello.c");
-end Hello_Spg_1;
-
-subprogram Hello_Spg_2
-properties
-  source_language => C;
-  source_name     => "user_Hello_Spg_2";
-  source_text     => ("hello.c");
-end Hello_Spg_2;
-
--------------
--- Threads --
--------------
-
-thread Task
-end Task;
-
-thread implementation Task.impl_1
-calls 
-Mycalls: {
-  P_Spg : subprogram Hello_Spg_1;
-};
-properties
-   Dispatch_Protocol                  => periodic;
-   Period                             => 1000ms;
-   Compute_Execution_time             => 0 ms .. 3 ms;
-   Deadline                           => 1000 ms;
-   Priority => 1;
-end Task.impl_1;
-
-thread implementation Task.impl_2
-calls 
-Mycalls: {
-  P_Spg : subprogram Hello_Spg_2;
-};
-properties
-   Dispatch_Protocol                  => periodic;
-   Period                             => 500ms;
-   Compute_Execution_time             => 0 ms .. 3 ms;
-   Deadline                           => 500 ms;
-   Priority => 2;
-end Task.impl_2;
-
----------------
--- Processor --
----------------
-
-processor cpurm
-properties
-  Deployment::Execution_Platform => native_compcert;
-end cpurm;
-
-processor implementation cpurm.impl
-properties
-   Scheduling_Protocol => (Posix_1003_Highest_Priority_First_Protocol);
-end cpurm.impl;
-
----------------
--- Processes --
----------------
-
-process node_a
-end node_a;
-
-process implementation node_a.impl
-subcomponents
-   Task1 : thread Task.impl_1;
-   Task2 : thread Task.impl_2;
-end node_a.impl;
-
-------------
--- System --
-------------
-
-system rma 
-end rma;
-
-system implementation rma.impl
-subcomponents
-   node_a : process node_a.impl;
-   cpu_rm : processor cpurm.impl;
-properties
-   Actual_Processor_Binding => (reference (cpu_rm)) applies to node_a;
-end rma.impl;
-
-end RMAAadl;

examples/aadlv2/rma/rma.aadl

@@ -100,6 +100,12 @@ public
     Actual_Processor_Binding => (reference (cpu_rm)) applies to rma;
   end rma.impl;
 
+  system implementation rma.compcert
+  extends rma.impl
+  properties
+    Deployment::Execution_Platform => native_compcert applies to cpu_rm;
+  end rma.compcert;
+
   system implementation rma.Xenomai
   extends rma.impl
   properties

examples/aadlv2/rma/scenario-compcert.aadl

@@ -8,7 +8,8 @@ public
     Ocarina_Config::Referencial_Files    =>
     ("node_a", "node_a.ref");
     Ocarina_Config::AADL_Files           =>
-    ("rma-compcert.aadl");
+    ("rma.aadl");
+    Ocarina_Config::Root_System_Name     => "rma.compcert";
     Ocarina_Config::Generator            => polyorb_hi_c;
     Ocarina_Config::Needed_Property_Sets =>
     (Ocarina_Config::Data_Model,