From 88952fbbb0e0035816d6cbb817ea854318aa9f55 Mon Sep 17 00:00:00 2001 From: msmit Date: Fri, 17 Jun 2011 11:54:29 +0000 Subject: Fri Jun 17 11:52:57 UTC 2011 Marcel Smit * examples/Hello/Hello_Base/Hello_Base.mpc: * examples/Hello/Receiver/Receiver.mpc: * examples/Hello/Sender/Sender.mpc: Regenerated, using the -e option in generate_component_mpc. We're using events in this example. * examples/Hello/step-by-step.html: Added the -e option to the description of generate_component_mpc. --- CIAO/ChangeLog | 11 +++++++++ CIAO/examples/Hello/Hello_Base/Hello_Base.mpc | 34 +++++++++++++-------------- CIAO/examples/Hello/Receiver/Receiver.mpc | 30 +++++++++++------------ CIAO/examples/Hello/Sender/Sender.mpc | 34 +++++++++++++-------------- CIAO/examples/Hello/step-by-step.html | 6 ++--- 5 files changed, 63 insertions(+), 52 deletions(-) diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index bbd2cb0aed8..497d9b92d5f 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,14 @@ +Fri Jun 17 11:52:57 UTC 2011 Marcel Smit + + * examples/Hello/Hello_Base/Hello_Base.mpc: + * examples/Hello/Receiver/Receiver.mpc: + * examples/Hello/Sender/Sender.mpc: + Regenerated, using the -e option in generate_component_mpc. + We're using events in this example. + + * examples/Hello/step-by-step.html: + Added the -e option to the description of generate_component_mpc. + Fri Jun 17 11:33:44 UTC 2011 Marcel Smit * examples/Hello/descriptors/PlanLocality_DifferentProcesses.cdp: diff --git a/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc b/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc index 11466cca696..4f6a3bdfdf6 100644 --- a/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc +++ b/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc @@ -1,36 +1,36 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -n -l../lib -o../lib Hello_Base" +// This file is generated with "generate_component_mpc.pl -e -n -l../lib -o../lib Hello_Base" -project(Hello_Base_idl_gen) : componentidldefaults { +project(Hello_Base_idl_gen) : componentidldefaults, avoids_ccm_noevent { custom_only = 1 - + idlflags += -Wb,stub_export_macro=HELLO_BASE_STUB_Export \ -Wb,stub_export_include=Hello_Base_stub_export.h \ -Wb,skel_export_macro=HELLO_BASE_SKEL_Export \ -Wb,skel_export_include=Hello_Base_skel_export.h \ - -Gxhex -Gxhsk -Gxhst + -Gxhex -Gxhsk -Gxhst IDL_Files { Hello_Base.idl } } -project(Hello_Base_lem_gen) : ciaoidldefaults { +project(Hello_Base_lem_gen) : ciaoidldefaults, avoids_ccm_noevent { after += Hello_Base_idl_gen custom_only = 1 idlflags += -Wb,stub_export_macro=HELLO_BASE_LEM_STUB_Export \ -Wb,stub_export_include=Hello_Base_lem_stub_export.h \ - -SS -Gxhst + -SS -Gxhst IDL_Files { Hello_BaseE.idl } } -project(Hello_Base_lem_stub) : ccm_svnt { - after += Hello_Base_lem_gen Hello_Base_stub +project(Hello_Base_lem_stub) : ccm_svnt, avoids_ccm_noevent { + after += Hello_Base_lem_gen Hello_Base_stub libs += Hello_Base_stub - + libpaths += ../lib libout = ../lib sharedname = Hello_Base_lem_stub @@ -53,10 +53,10 @@ project(Hello_Base_lem_stub) : ccm_svnt { } } -project(Hello_Base_stub) : ccm_stub { - after += Hello_Base_idl_gen - libs += - +project(Hello_Base_stub) : ccm_stub, avoids_ccm_noevent { + after += Hello_Base_idl_gen + libs += + libpaths += ../lib libout = ../lib sharedname = Hello_Base_stub @@ -80,16 +80,16 @@ project(Hello_Base_stub) : ccm_stub { } -project(Hello_Base_skel) : ciao_executor { +project(Hello_Base_skel) : ciao_executor, avoids_ccm_noevent { after += Hello_Base_stub Hello_Base_lem_stub sharedname = Hello_Base_skel libs += Hello_Base_stub - - + + libpaths += ../lib libout = ../lib dynamicflags += HELLO_BASE_SKEL_BUILD_DLL - + IDL_Files { } diff --git a/CIAO/examples/Hello/Receiver/Receiver.mpc b/CIAO/examples/Hello/Receiver/Receiver.mpc index 0242c4997d9..277f55bc9c1 100644 --- a/CIAO/examples/Hello/Receiver/Receiver.mpc +++ b/CIAO/examples/Hello/Receiver/Receiver.mpc @@ -1,38 +1,38 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -l ../lib -o ../lib -p Hello_Base Receiver" +// This file is generated with "generate_component_mpc.pl -e -l ../lib -o ../lib -p Hello_Base Receiver" -project(Hello_Base_Receiver_idl_gen) : componentidldefaults { +project(Hello_Base_Receiver_idl_gen) : componentidldefaults, avoids_ccm_noevent { custom_only = 1 - + idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ -Wb,stub_export_include=Receiver_stub_export.h \ -Wb,skel_export_macro=RECEIVER_SVNT_Export \ -Wb,skel_export_include=Receiver_svnt_export.h \ -Wb,exec_export_macro=RECEIVER_EXEC_Export \ -Wb,exec_export_include=Receiver_exec_export.h \ - -Gxhex -Gxhsk -Gxhst + -Gxhex -Gxhsk -Gxhst IDL_Files { Receiver.idl } } -project(Hello_Base_Receiver_lem_gen) : ciaoidldefaults { +project(Hello_Base_Receiver_lem_gen) : ciaoidldefaults, avoids_ccm_noevent { after += Hello_Base_Receiver_idl_gen custom_only = 1 idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst + -SS -Gxhst IDL_Files { ReceiverE.idl } } -project(Hello_Base_Receiver_lem_stub) : ccm_svnt { +project(Hello_Base_Receiver_lem_stub) : ccm_svnt, avoids_ccm_noevent { after += Hello_Base_Receiver_lem_gen Hello_Base_Receiver_stub Hello_Base_stub Hello_Base_lem_stub libs += Hello_Base_stub Hello_Base_lem_stub Receiver_stub - + libpaths += ../lib libout = ../lib sharedname = Receiver_lem_stub @@ -55,10 +55,10 @@ project(Hello_Base_Receiver_lem_stub) : ccm_svnt { } } -project(Hello_Base_Receiver_stub) : ccm_stub { +project(Hello_Base_Receiver_stub) : ccm_stub, avoids_ccm_noevent { after += Hello_Base_Receiver_idl_gen Hello_Base_stub Hello_Base_lem_stub libs += Hello_Base_stub Hello_Base_lem_stub - + libpaths += ../lib libout = ../lib sharedname = Receiver_stub @@ -81,11 +81,11 @@ project(Hello_Base_Receiver_stub) : ccm_stub { } } -project(Hello_Base_Receiver_exec) : ciao_executor { +project(Hello_Base_Receiver_exec) : ciao_executor, avoids_ccm_noevent { after += Hello_Base_lem_stub Hello_Base_Receiver_lem_stub Hello_Base_Receiver_stub sharedname = Receiver_exec libs += Hello_Base_lem_stub Receiver_stub Receiver_lem_stub Hello_Base_stub Hello_Base_lem_stub - + libpaths += ../lib libout = ../lib dynamicflags += RECEIVER_EXEC_BUILD_DLL @@ -107,18 +107,18 @@ project(Hello_Base_Receiver_exec) : ciao_executor { } -project(Hello_Base_Receiver_svnt) : ciao_servant { +project(Hello_Base_Receiver_svnt) : ciao_servant, avoids_ccm_noevent { after += Hello_Base_skel Hello_Base_lem_stub Hello_Base_Receiver_lem_stub sharedname = Receiver_svnt libs += Receiver_stub Receiver_lem_stub \ Hello_Base_skel \ Hello_Base_stub \ Hello_Base_lem_stub - + libpaths += ../lib libout = ../lib dynamicflags += RECEIVER_SVNT_BUILD_DLL - + IDL_Files { } diff --git a/CIAO/examples/Hello/Sender/Sender.mpc b/CIAO/examples/Hello/Sender/Sender.mpc index 35885692bbf..c155d267eb6 100644 --- a/CIAO/examples/Hello/Sender/Sender.mpc +++ b/CIAO/examples/Hello/Sender/Sender.mpc @@ -1,38 +1,38 @@ // $Id$ -// This file is generated with "generate_component_mpc.pl -c starter -l ../lib -o ../lib -p Hello_Base Sender" +// This file is generated with "generate_component_mpc.pl -e -l ../lib -o ../lib -c starter -p Hello_Base Sender" -project(Hello_Base_Sender_idl_gen) : componentidldefaults { +project(Hello_Base_Sender_idl_gen) : componentidldefaults, avoids_ccm_noevent { custom_only = 1 - + idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ -Wb,stub_export_include=Sender_stub_export.h \ -Wb,skel_export_macro=SENDER_SVNT_Export \ -Wb,skel_export_include=Sender_svnt_export.h \ -Wb,exec_export_macro=SENDER_EXEC_Export \ -Wb,exec_export_include=Sender_exec_export.h \ - -Gxhex -Gxhsk -Gxhst + -Gxhex -Gxhsk -Gxhst IDL_Files { Sender.idl } } -project(Hello_Base_Sender_lem_gen) : ciaoidldefaults { +project(Hello_Base_Sender_lem_gen) : ciaoidldefaults, avoids_ccm_noevent { after += Hello_Base_Sender_idl_gen custom_only = 1 idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst + -SS -Gxhst IDL_Files { SenderE.idl } } -project(Hello_Base_Sender_lem_stub) : ccm_svnt { +project(Hello_Base_Sender_lem_stub) : ccm_svnt, avoids_ccm_noevent { after += Hello_Base_Sender_lem_gen Hello_Base_Sender_stub Hello_Base_stub Hello_Base_lem_stub libs += Hello_Base_stub Hello_Base_lem_stub Sender_stub - + libpaths += ../lib libout = ../lib sharedname = Sender_lem_stub @@ -55,10 +55,10 @@ project(Hello_Base_Sender_lem_stub) : ccm_svnt { } } -project(Hello_Base_Sender_stub) : ccm_stub { +project(Hello_Base_Sender_stub) : ccm_stub, avoids_ccm_noevent { after += Hello_Base_Sender_idl_gen Hello_Base_stub Hello_Base_lem_stub libs += Hello_Base_stub Hello_Base_lem_stub - + libpaths += ../lib libout = ../lib sharedname = Sender_stub @@ -81,11 +81,11 @@ project(Hello_Base_Sender_stub) : ccm_stub { } } -project(Hello_Base_Sender_exec) : ciao_executor { +project(Hello_Base_Sender_exec) : ciao_executor, avoids_ccm_noevent { after += Hello_Base_lem_stub Hello_Base_Sender_lem_stub Hello_Base_Sender_stub sharedname = Sender_exec libs += Hello_Base_lem_stub Sender_stub Sender_lem_stub Hello_Base_stub Hello_Base_lem_stub - + libpaths += ../lib libout = ../lib dynamicflags += SENDER_EXEC_BUILD_DLL @@ -107,18 +107,18 @@ project(Hello_Base_Sender_exec) : ciao_executor { } -project(Hello_Base_Sender_svnt) : ciao_servant { +project(Hello_Base_Sender_svnt) : ciao_servant, avoids_ccm_noevent { after += Hello_Base_skel Hello_Base_lem_stub Hello_Base_Sender_lem_stub sharedname = Sender_svnt libs += Sender_stub Sender_lem_stub \ Hello_Base_skel \ Hello_Base_stub \ Hello_Base_lem_stub - + libpaths += ../lib libout = ../lib dynamicflags += SENDER_SVNT_BUILD_DLL - + IDL_Files { } @@ -138,11 +138,11 @@ project(Hello_Base_Sender_svnt) : ciao_servant { } } -project (Hello_Base_starter) : ccm_stub, valuetype { +project (Hello_Base_starter) : ccm_stub, valuetype, avoids_ccm_noevent { exename = starter after += Hello_Base_Sender_stub libs += Sender_stub Hello_Base_stub Hello_Base_lem_stub - + libpaths += ../lib exeout = ../lib IDL_Files { diff --git a/CIAO/examples/Hello/step-by-step.html b/CIAO/examples/Hello/step-by-step.html index ea3c80886d4..e0211218733 100644 --- a/CIAO/examples/Hello/step-by-step.html +++ b/CIAO/examples/Hello/step-by-step.html @@ -80,7 +80,7 @@ All these generators will be handled throughout this tutorial. and Hello_Base_svnt projects are organized.
There's a utility in $CIAO_ROOT/bin, called generate_component_mpc. This a perl script which is able to generate a complete mpc file based on a given name. The commandline used to generate Hello_Base.mpc is:
- $CIAO_ROOT/bin/generate_component_mpc.pl -n -l../lib -o../lib Hello_Base
+ $CIAO_ROOT/bin/generate_component_mpc.pl -e -n -l../lib -o../lib Hello_Base
Use $CIAO_ROOT/bin/generate_component_mpc.pl --help to get more information about this tool. See also the Quoter tutorial for more information. @@ -93,10 +93,10 @@ All these generators will be handled throughout this tutorial.
  1. Execute :
      -
    • $CIAO_ROOT/bin/generate_component_mpc.pl -l ../lib -o ../lib -c starter -p Hello_Base Sender in Sender directory. +
    • $CIAO_ROOT/bin/generate_component_mpc.pl -e -l ../lib -o ../lib -c starter -p Hello_Base Sender in Sender directory. The -c option will be handled later on in the step-by-step.
      • -
    • $CIAO_ROOT/bin/generate_component_mpc.pl -l ../lib -o ../lib -p Hello_Base Receiver in Receiver directory +
    • $CIAO_ROOT/bin/generate_component_mpc.pl -e -l ../lib -o ../lib -p Hello_Base Receiver in Receiver directory
    Note: -- cgit v1.2.1