* Suppress Petri Net examples, now in AADLib

configure.ac

@@ -406,8 +406,6 @@ AC_OUTPUT([
 	doc/Makefile
 	doc/real/Makefile
 	examples/Makefile
-	examples/petri_net/Makefile
-	examples/petri_net/robot/Makefile
 	examples/real/Makefile
 	examples/real/lib/Makefile
 	examples/real/resources/Makefile

examples/Makefile.am

-SUBDIRS= petri_net real
+SUBDIRS= real
 
 EXTRA_DIST = $(srcdir)/Makefile.common
 

examples/petri_net/Makefile.am

-SUBDIRS= robot
-
-EXTRA_DIST = $(srcdir)/../Makefile.common
-
-SAMPLE_DIR = $(prefix)/examples/ocarina/petri_net
-
-install-data-local:
-	$(INSTALL) -d $(DESTDIR)$(SAMPLE_DIR)
-	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(SAMPLE_DIR)
-
-uninstall-local:
-	rm -rf $(DESTDIR)$(SAMPLE_DIR)

examples/petri_net/README

-Petri Nets examples
--------------------
-
-This directory contains examples of models that can be analysed using
-the Petri net generator
-
-* robot: a simple robotic system
-
-To test models, simply run
-
-   carina -f -g petri_nets *.aadl
-

examples/petri_net/robot/MANIFEST

-AADL_VERSION=-aadlv2
-OCARINA_FLAGS= -f -g petri_nets

examples/petri_net/robot/Makefile.am

-include $(srcdir)/../../Makefile.common
-
-EXTRA_DIST = $(srcdir)/robot.aadl
-

examples/petri_net/robot/robot.aadl

-package Robot
-public
-  with Deployment;
-  with Data_Model;
-
-  ----------
-  -- Data --
-  ----------
-
-  data Alpha_Type
-  properties
-    Data_Model::Data_Representation => integer;
-  end Alpha_Type;
-
-  -------------------
-  --  Subprograms  --
-  -------------------
-
-  subprogram collecte_donnee
-  features
-    d_source : out parameter Alpha_Type;
-  end collecte_donnee;
-
-  subprogram traite
-  features
-    d_info  : in parameter Alpha_Type;
-    d_ordre : out parameter Alpha_Type;
-  end traite;
-
-  subprogram action
-  features
-    d_action : in parameter Alpha_Type;
-  end action;
-
-  ---------------
-  --  Threads  --
-  ---------------
-
-  --  interfaces
-
-  thread capteur
-  features
-    evenement    : out event data port Alpha_Type;
-  end capteur;
-
-  thread controle
-  features
-    info_capteur : in event data port Alpha_Type;
-    comm_servo   : out event data port Alpha_Type;
-  end controle;
-
-  thread servomoteur
-  features
-    ordre        : in event data port Alpha_Type;
-  end servomoteur;
-
-  --  implementations
-
-  thread implementation capteur.i
-  calls C: {
-    D_Spg : subprogram collecte_donnee;
-    };
-  connections
-    conn1: parameter D_Spg.d_source -> evenement;
-  properties
-    Dispatch_Protocol => Periodic;
-    Period            => 110 ms;
-  end capteur.i;
-
-  thread implementation controle.i
-  calls C: {
-    T_Spg : subprogram traite;
-    };
-  connections
-    conn1: parameter info_capteur  -> T_Spg.d_info;
-    conn2: parameter T_Spg.d_ordre -> comm_servo;
-  properties
-    Dispatch_Protocol => Sporadic;
-    Period            => 110 ms;
-    Deployment::Priority          => 2;
-  end controle.i;
-
-  thread implementation servomoteur.i
-  calls main : {
-    A_Spg : subprogram action;
-    };
-  connections
-    conn1: parameter ordre -> A_Spg.d_action;
-  properties
-    Dispatch_Protocol => Aperiodic;
-    Deployment::Priority          => 1;
-  end servomoteur.i;
-
-  -----------------
-  --  Processes  --
-  -----------------
-
-  --  interfaces
-
-  process p_capteur
-  features
-    evenement           : out event data port Alpha_Type;
-  end p_capteur;
-
-  process p_controle
-  features
-    info_capteur_droit  : in event data port Alpha_Type;
-    comm_servo_droit    : out event data port Alpha_Type;
-
-    info_capteur_gauche : in event data port Alpha_Type;
-    comm_servo_gauche   : out event data port Alpha_Type;
-  end p_controle;
-
-  process p_servomoteur
-  features
-    ordre               : in event data port Alpha_Type;
-  end p_servomoteur;
-
-  --  implementations
-
-  process implementation p_capteur.i
-  subcomponents
-    th_c : thread capteur.i;
-  connections
-    conn1: port th_c.evenement            -> evenement;
-  end p_capteur.i;
-
-  process implementation p_controle.i
-  subcomponents
-    th_ctrl_droit  : thread controle.i;
-    th_ctrl_gauche : thread controle.i;
-  connections
-    conn1: port info_capteur_droit        -> th_ctrl_droit.info_capteur;
-    conn2: port th_ctrl_droit.comm_servo  -> comm_servo_droit;
-    conn3: port info_capteur_gauche       -> th_ctrl_gauche.info_capteur;
-    conn4: port th_ctrl_gauche.comm_servo -> comm_servo_gauche;
-  end p_controle.i;
-
-  process implementation p_servomoteur.i
-  subcomponents
-    th_servomoteur : thread servomoteur.i;
-  connections
-    conn1: port ordre -> th_servomoteur.ordre;
-  end p_servomoteur.i;
-
-  --------------
-  --  System  --
-  --------------
-
-  processor the_processor
-  end the_processor;
-
-  --  interface
-
-  system robot
-  end robot;
-
-  --  implementation
-
-  system implementation robot.i
-  subcomponents
-    proc_capteur_droit      : process p_capteur.i;
-    proc_capteur_gauche     : process p_capteur.i;
-
-    proc_controle           : process p_controle.i;
-
-    proc_servomoteur_droit  : process p_servomoteur.i;
-    proc_servomoteur_gauche : process p_servomoteur.i;
-
-    CPU1                    : processor the_processor;
-  connections
-    conn1: port proc_capteur_droit.evenement    -> proc_controle.info_capteur_droit;
-    conn2: port proc_capteur_gauche.evenement   -> proc_controle.info_capteur_gauche;
-
-    conn3: port proc_controle.comm_servo_droit  -> proc_servomoteur_droit.ordre;
-    conn4: port proc_controle.comm_servo_gauche -> proc_servomoteur_gauche.ordre;
-  properties
-    actual_processor_binding => (reference (CPU1)) applies to proc_capteur_droit;
-    actual_processor_binding => (reference (CPU1)) applies to proc_capteur_gauche;
-
-    actual_processor_binding => (reference (CPU1)) applies to proc_controle;
-
-    actual_processor_binding => (reference (CPU1)) applies to proc_servomoteur_droit;
-    actual_processor_binding => (reference (CPU1)) applies to proc_servomoteur_gauche;
-  end robot.i;
-
-end Robot;

examples/petri_net/robot/robot.aadl.out

-robot.aadl:170:05: warning: CPU1 references a component type
-ocarina: Total: 0 error and 1 warning
-robot.aadl:170:05: warning: CPU1 references a component type
-ocarina: Total: 0 error and 1 warning