diff options
Diffstat (limited to 'CIAO')
-rw-r--r-- | CIAO/ChangeLog | 13 | ||||
-rw-r--r-- | CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc | 14 | ||||
-rw-r--r-- | CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc | 16 | ||||
-rw-r--r-- | CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc | 14 | ||||
-rw-r--r-- | CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl | 2 | ||||
-rw-r--r-- | CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc | 12 | ||||
-rwxr-xr-x | CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl | 22 | ||||
-rw-r--r-- | CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc (renamed from CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.mpc) | 10 | ||||
-rwxr-xr-x | CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.idl | 22 |
9 files changed, 69 insertions, 56 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index c7072c07cff..e823b955df2 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,16 @@ +Wed Jun 30 14:47:44 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.idl: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.mpc: + Renamed Shapes_msg.idl to Shapes_ShapeType_msg.idl + Wed Jun 30 14:38:33 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu> * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp: diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc index 1604bf5477e..91a093ea111 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc @@ -37,10 +37,10 @@ project(Shapes_Control_lem_gen) : ciaoidldefaults { } project(Shapes_Control_comp_lem_stub) : ccm_svnt { - after += Shapes_Control_lem_gen Shapes_Control_comp_stub Shapes_msg_stub \ + after += Shapes_Control_lem_gen Shapes_Control_comp_stub Shapes_ShapeType_msg_stub \ Shapes_Control_obj_stub - libs += Shapes_msg_stub Shapes_Control_comp_stub Shapes_Control_obj_stub + libs += Shapes_ShapeType_msg_stub Shapes_Control_comp_stub Shapes_Control_obj_stub libpaths += ../../lib libout = ../../lib @@ -67,10 +67,10 @@ project(Shapes_Control_comp_lem_stub) : ccm_svnt { } project(Shapes_Control_comp_stub) : ccm_stub { - after += Shapes_Control_idl_gen Shapes_msg_stub \ + after += Shapes_Control_idl_gen Shapes_ShapeType_msg_stub \ Shapes_Control_obj_stub Shapes_Control_obj_lem_stub - libs += Shapes_msg_stub Shapes_Control_obj_stub + libs += Shapes_ShapeType_msg_stub Shapes_Control_obj_stub libpaths += ../../lib libout = ../../lib @@ -100,7 +100,7 @@ project(Shapes_Control_comp_exec) : ciao_executor { after += Shapes_Control_comp_lem_stub Shapes_Control_comp_stub \ Shapes_Control_obj_lem_stub - libs += Shapes_Control_comp_stub Shapes_Control_comp_lem_stub Shapes_msg_stub \ + libs += Shapes_Control_comp_stub Shapes_Control_comp_lem_stub Shapes_ShapeType_msg_stub \ Shapes_Control_obj_lem_stub Shapes_Control_obj_stub libpaths += ../../lib libout = ../../lib @@ -128,12 +128,12 @@ project(Shapes_Control_comp_exec) : ciao_executor { project(Shapes_Control_comp_svnt) : ciao_servant { - after += Shapes_msg_stub Shapes_Control_comp_lem_stub \ + after += Shapes_ShapeType_msg_stub Shapes_Control_comp_lem_stub \ Shapes_Control_comp_stub Shapes_Control_obj_svnt \ Shapes_Control_obj_lem_stub libs += Shapes_Control_comp_stub Shapes_Control_comp_lem_stub \ - Shapes_msg_stub \ + Shapes_ShapeType_msg_stub \ Shapes_Control_obj_stub Shapes_Control_obj_svnt \ Shapes_Control_obj_lem_stub libpaths += ../../lib diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc index c7ab8d79b62..f136f705023 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc @@ -36,9 +36,9 @@ project(Shapes_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { project(Shapes_Receiver_comp_lem_stub) : ccm_svnt, dds4ccm_base { after += Shapes_Receiver_lem_gen Shapes_Receiver_comp_stub Shapes_ShapeType_conn_stub \ - Shapes_msg_stub + Shapes_ShapeType_msg_stub - libs += Shapes_Receiver_comp_stub Shapes_ShapeType_conn_stub Shapes_msg_stub + libs += Shapes_Receiver_comp_stub Shapes_ShapeType_conn_stub Shapes_ShapeType_msg_stub libpaths += ../../lib libout = ../../lib @@ -66,9 +66,9 @@ project(Shapes_Receiver_comp_lem_stub) : ccm_svnt, dds4ccm_base { project(Shapes_Receiver_comp_stub) : ccm_stub, dds4ccm_base { after += Shapes_Receiver_idl_gen Shapes_ShapeType_conn_stub \ - Shapes_msg_stub Shapes_ShapeType_conn_lem_gen + Shapes_ShapeType_msg_stub Shapes_ShapeType_conn_lem_gen - libs += Shapes_ShapeType_conn_stub Shapes_msg_stub + libs += Shapes_ShapeType_conn_stub Shapes_ShapeType_msg_stub libpaths += ../../lib libout = ../../lib @@ -96,10 +96,10 @@ project(Shapes_Receiver_comp_stub) : ccm_stub, dds4ccm_base { project(Shapes_Receiver_comp_exec) : ciao_executor, dds4ccm_base { after += Shapes_Receiver_comp_lem_stub Shapes_Receiver_comp_stub \ - Shapes_msg_stub Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_lem_stub \ + Shapes_ShapeType_msg_stub Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_lem_stub \ DDS4CCM_lem_stub - libs += Shapes_Receiver_comp_stub Shapes_Receiver_comp_lem_stub Shapes_msg_stub \ + libs += Shapes_Receiver_comp_stub Shapes_Receiver_comp_lem_stub Shapes_ShapeType_msg_stub \ Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_lem_stub DDS4CCM_lem_stub libpaths += ../../lib libout = ../../lib @@ -127,11 +127,11 @@ project(Shapes_Receiver_comp_exec) : ciao_executor, dds4ccm_base { project(Shapes_Receiver_comp_svnt) : ciao_servant, dds4ccm_base { - after += Shapes_Receiver_comp_lem_stub Shapes_msg_stub \ + after += Shapes_Receiver_comp_lem_stub Shapes_ShapeType_msg_stub \ Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_svnt Shapes_Receiver_comp_exec \ Shapes_ShapeType_conn_lem_stub DDS4CCM_lem_stub DDS4CCM_skel - libs += Shapes_Receiver_comp_stub Shapes_Receiver_comp_lem_stub Shapes_msg_stub \ + libs += Shapes_Receiver_comp_stub Shapes_Receiver_comp_lem_stub Shapes_ShapeType_msg_stub \ Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_svnt Shapes_Receiver_comp_exec \ Shapes_ShapeType_conn_lem_stub DDS4CCM_lem_stub DDS4CCM_skel libpaths += ../../lib diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc index 66896da62a3..03bb8a707d5 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc @@ -35,9 +35,9 @@ project(Shapes_Sender_lem_gen) : ciaoidldefaults, dds4ccm { } project(Shapes_Sender_comp_lem_stub) : ccm_svnt, dds4ccm_base { - after += Shapes_Sender_lem_gen Shapes_Sender_comp_stub Shapes_msg_stub + after += Shapes_Sender_lem_gen Shapes_Sender_comp_stub Shapes_ShapeType_msg_stub - libs += Shapes_msg_stub Shapes_Sender_comp_stub + libs += Shapes_ShapeType_msg_stub Shapes_Sender_comp_stub libpaths += ../../lib libout = ../../lib @@ -64,9 +64,9 @@ project(Shapes_Sender_comp_lem_stub) : ccm_svnt, dds4ccm_base { } project(Shapes_Sender_comp_stub) : ccm_stub, dds4ccm_base { - after += Shapes_Sender_idl_gen Shapes_msg_stub Shapes_ShapeType_conn_stub + after += Shapes_Sender_idl_gen Shapes_ShapeType_msg_stub Shapes_ShapeType_conn_stub - libs += Shapes_msg_stub Shapes_ShapeType_conn_stub + libs += Shapes_ShapeType_msg_stub Shapes_ShapeType_conn_stub libpaths += ../../lib libout = ../../lib @@ -97,7 +97,7 @@ project(Shapes_Sender_comp_exec) : ciao_executor, dds4ccm_base { Shapes_ShapeType_conn_stub Shapes_Control_comp_lem_stub Shapes_Control_obj_lem_stub \ Shapes_defn_stub Shapes_Control_obj_stub - libs += Shapes_Sender_comp_stub Shapes_Sender_comp_lem_stub Shapes_msg_stub \ + libs += Shapes_Sender_comp_stub Shapes_Sender_comp_lem_stub Shapes_ShapeType_msg_stub \ Shapes_ShapeType_conn_lem_stub Shapes_ShapeType_conn_stub Shapes_Control_comp_lem_stub \ Shapes_Control_obj_lem_stub Shapes_defn_stub Shapes_Control_obj_stub libpaths += ../../lib @@ -126,14 +126,14 @@ project(Shapes_Sender_comp_exec) : ciao_executor, dds4ccm_base { project(Shapes_Sender_comp_svnt) : ciao_servant, dds4ccm_base { - after += Shapes_msg_stub Shapes_Sender_comp_lem_stub DDS4CCM_lem_stub \ + after += Shapes_ShapeType_msg_stub Shapes_Sender_comp_lem_stub DDS4CCM_lem_stub \ DDS4CCM_skel Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_svnt \ Shapes_ShapeType_conn_lem_stub Shapes_Control_comp_svnt \ Shapes_Control_obj_stub Shapes_Control_obj_svnt \ Shapes_Control_obj_lem_stub libs += Shapes_Sender_comp_stub Shapes_Sender_comp_lem_stub \ - Shapes_msg_stub DDS4CCM_lem_stub DDS4CCM_skel \ + Shapes_ShapeType_msg_stub DDS4CCM_lem_stub DDS4CCM_skel \ Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_svnt \ Shapes_ShapeType_conn_lem_stub Shapes_Control_comp_svnt \ Shapes_Control_obj_stub Shapes_Control_obj_svnt \ diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl index 23e893b0400..a6a1db355f4 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl @@ -6,7 +6,7 @@ #include <Components.idl> #include <ccm_dds.idl> -#include "Shapes_msg.idl" +#include "Shapes_ShapeType_msg.idl" #pragma ciao lem "Shapes_ShapeType_connE.idl" diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc index 718b629f157..36a1afb2946 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc @@ -35,9 +35,9 @@ project(Shapes_ShapeType_conn_lem_gen) : ciaoidldefaults, dds4ccm { } project(Shapes_ShapeType_conn_lem_stub) : ccm_svnt, dds4ccm_base { - after += Shapes_ShapeType_conn_lem_gen Shapes_ShapeType_conn_stub Shapes_msg_stub DDS4CCM_lem_stub + after += Shapes_ShapeType_conn_lem_gen Shapes_ShapeType_conn_stub Shapes_ShapeType_msg_stub DDS4CCM_lem_stub - libs += Shapes_msg_stub Shapes_ShapeType_conn_stub DDS4CCM_lem_stub + libs += Shapes_ShapeType_msg_stub Shapes_ShapeType_conn_stub DDS4CCM_lem_stub libpaths += ../lib libout = ../lib @@ -64,9 +64,9 @@ project(Shapes_ShapeType_conn_lem_stub) : ccm_svnt, dds4ccm_base { } project(Shapes_ShapeType_conn_stub) : ccm_stub, dds4ccm_base { - after += Shapes_ShapeType_conn_idl_gen Shapes_msg_stub + after += Shapes_ShapeType_conn_idl_gen Shapes_ShapeType_msg_stub - libs += Shapes_msg_stub + libs += Shapes_ShapeType_msg_stub libpaths += ../lib libout = ../lib @@ -95,7 +95,7 @@ project(Shapes_ShapeType_conn_stub) : ccm_stub, dds4ccm_base { project(Shapes_ShapeType_conn_exec) : ciao_executor, dds4ccm_impl { after += Shapes_ShapeType_conn_lem_stub Shapes_ShapeType_conn_stub DDS4CCM_lem_stub - libs += Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_lem_stub Shapes_msg_stub DDS4CCM_lem_stub + libs += Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_lem_stub Shapes_ShapeType_msg_stub DDS4CCM_lem_stub libpaths += ../lib libout = ../lib @@ -124,7 +124,7 @@ project(Shapes_ShapeType_conn_exec) : ciao_executor, dds4ccm_impl { project(Shapes_ShapeType_conn_svnt) : ciao_servant, dds4ccm_impl { after += Shapes_ShapeType_conn_lem_stub Shapes_ShapeType_conn_exec Shapes_ShapeType_conn_stub DDS4CCM_lem_stub - libs += Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_lem_stub Shapes_msg_stub Shapes_ShapeType_conn_exec \ + libs += Shapes_ShapeType_conn_stub Shapes_ShapeType_conn_lem_stub Shapes_ShapeType_msg_stub Shapes_ShapeType_conn_exec \ DDS4CCM_lem_stub libpaths += ../lib libout = ../lib diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl new file mode 100755 index 00000000000..84a18379cc9 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl @@ -0,0 +1,22 @@ +// $Id$ + +#ifndef SHAPES_SHAPETYPE_MSG_IDL_ +#define SHAPES_SHAPETYPE_MSG_IDL_ + +#pragma ndds typesupport "Shapes_ShapeType_msgSupport.h" +#pragma opendds typesupport "Shapes_ShapeType_msgTypeSupportC.h" +#pragma splice typesupport "Shapes_ShapeType_msgDscpC.h" + +#pragma DCPS_DATA_TYPE "ShapeType_msg" +#pragma DCPS_DATA_KEY "ShapeType_msg color" + +struct ShapeType_msg { + string color; //@key + long x; + long y; + long shapesize; +}; + +#pragma keylist ShapeType_msg color + +#endif /* SHAPES_SHAPETYPE_MSG_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc index b6ff0332cec..61b953bb215 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.mpc +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc @@ -1,26 +1,26 @@ // $Id$ -project (Shapes_msg_stub) : taoidldefaults, dds4ccm_ts_default, Shapes { +project (Shapes_ShapeType_msg_stub) : taoidldefaults, dds4ccm_ts_default, Shapes { idlflags += -SS -Sci \ -Wb,stub_export_macro=SHAPES_MSG_STUB_Export \ - -Wb,stub_export_include=Shapes_msg_stub_export.h \ + -Wb,stub_export_include=Shapes_ShapeType_msg_stub_export.h \ -o GeneratedCode libout = ../lib - sharedname = Shapes_msg_stub + sharedname = Shapes_ShapeType_msg_stub dynamicflags += SHAPES_MSG_STUB_BUILD_DLL IDL_Files { idlflags += -Gxhst gendir = GeneratedCode - Shapes_msg.idl + Shapes_ShapeType_msg.idl } opendds_ts_flags += --export=SHAPES_BASE_MSG_Export DDSGenerator_Files { - Shapes_msg.idl + Shapes_ShapeType_msg.idl gendir = GeneratedCode } diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.idl deleted file mode 100755 index 7074f4c993a..00000000000 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_msg.idl +++ /dev/null @@ -1,22 +0,0 @@ -// $Id$ - -#ifndef SHAPES_MSG_IDL_ -#define SHAPES_MSG_IDL_ - -#pragma ndds typesupport "Shapes_msgSupport.h" -#pragma opendds typesupport "Shapes_msgTypeSupportC.h" -#pragma splice typesupport "Shapes_msgDscpC.h" - -#pragma DCPS_DATA_TYPE "ShapeType" -#pragma DCPS_DATA_KEY "ShapeType color" - -struct ShapeType_msg { - string color; //@key - long x; - long y; - long shapesize; -}; - -#pragma keylist ShapeType color - -#endif /* SHAPES_MSG_IDL_ */ |