[openrtm-commit:02357] r2906 - in branches/FSM4RTC/OpenRTM-aist: src/ext/sdo/extended_fsm src/lib/rtm src/lib/rtm/idl win32/OpenRTM-aist/ext/sdo/extended_fsm

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2017-01-31 10:39:20 +0900 (Tue, 31 Jan 2017)
New Revision: 2906

Added:
   branches/FSM4RTC/OpenRTM-aist/src/lib/rtm/idl/ExtendedFsmService.idl
Removed:
   branches/FSM4RTC/OpenRTM-aist/src/ext/sdo/extended_fsm/ExtendedFsmService.idl
Modified:
   branches/FSM4RTC/OpenRTM-aist/src/lib/rtm/FsmActionListener.h
   branches/FSM4RTC/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
   branches/FSM4RTC/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/extended_fsm/Makefile.am
Log:
[FSM4RTC] ExtendedFsmService.idl moved to src/lib/rtm/idl.

Deleted: branches/FSM4RTC/OpenRTM-aist/src/ext/sdo/extended_fsm/ExtendedFsmService.idl
===================================================================
--- branches/FSM4RTC/OpenRTM-aist/src/ext/sdo/extended_fsm/ExtendedFsmService.idl	2017-01-31 01:39:01 UTC (rev 2905)
+++ branches/FSM4RTC/OpenRTM-aist/src/ext/sdo/extended_fsm/ExtendedFsmService.idl	2017-01-31 01:39:20 UTC (rev 2906)
@@ -1,37 +0,0 @@
-#ifndef _EXTENDED_FSM_SERVICE_IDL_
-#define _EXTENDED_FSM_SERVICE_IDL_
-
-#include <RTC.idl>
-
-#pragma prefix "omg.org"
-
-module RTC
-{
-    struct FsmEventProfile
-    {
-        string name;
-        string data_type;
-    };
-    #pragma version FsmEventProfile 1.0
-    typedef sequence<FsmEventProfile> FsmEventProfileList;
-
-    struct FsmStructure
-    {
-        string name;
-        string structure;
-        FsmEventProfileList event_profiles;
-        NVList properties;
-    };
-    #pragma version FsmStructure 1.0
-
-    interface ExtendedFsmService : SDOPackage::SDOService
-    {
-        string get_current_state();
-        ReturnCode_t set_fsm_structure(in FsmStructure fsm_structure);
-        ReturnCode_t get_fsm_structure(out FsmStructure fsm_structure);
-    };
-    #pragma version ExtendedFsmService 1.0
-};
-
-#endif // _EXTENDED_FSM_SERVICE_IDL_
-

Modified: branches/FSM4RTC/OpenRTM-aist/src/lib/rtm/FsmActionListener.h
===================================================================
--- branches/FSM4RTC/OpenRTM-aist/src/lib/rtm/FsmActionListener.h	2017-01-31 01:39:01 UTC (rev 2905)
+++ branches/FSM4RTC/OpenRTM-aist/src/lib/rtm/FsmActionListener.h	2017-01-31 01:39:20 UTC (rev 2906)
@@ -26,12 +26,10 @@
 #include <rtm/RTC.h>
 #include <rtm/idl/RTCSkel.h>
 #include <rtm/ConnectorBase.h>
+#include <rtm/idl/ExtendedFsmServiceStub.h>
 
 namespace RTC
 {
-  struct FsmStructure
-  {
-  };
   /*!
    * @if jp
    *

Copied: branches/FSM4RTC/OpenRTM-aist/src/lib/rtm/idl/ExtendedFsmService.idl (from rev 2762, branches/FSM4RTC/OpenRTM-aist/src/ext/sdo/extended_fsm/ExtendedFsmService.idl)
===================================================================
--- branches/FSM4RTC/OpenRTM-aist/src/lib/rtm/idl/ExtendedFsmService.idl	                        (rev 0)
+++ branches/FSM4RTC/OpenRTM-aist/src/lib/rtm/idl/ExtendedFsmService.idl	2017-01-31 01:39:20 UTC (rev 2906)
@@ -0,0 +1,37 @@
+#ifndef _EXTENDED_FSM_SERVICE_IDL_
+#define _EXTENDED_FSM_SERVICE_IDL_
+
+#include <RTC.idl>
+
+#pragma prefix "omg.org"
+
+module RTC
+{
+    struct FsmEventProfile
+    {
+        string name;
+        string data_type;
+    };
+    #pragma version FsmEventProfile 1.0
+    typedef sequence<FsmEventProfile> FsmEventProfileList;
+
+    struct FsmStructure
+    {
+        string name;
+        string structure;
+        FsmEventProfileList event_profiles;
+        NVList properties;
+    };
+    #pragma version FsmStructure 1.0
+
+    interface ExtendedFsmService : SDOPackage::SDOService
+    {
+        string get_current_state();
+        ReturnCode_t set_fsm_structure(in FsmStructure fsm_structure);
+        ReturnCode_t get_fsm_structure(out FsmStructure fsm_structure);
+    };
+    #pragma version ExtendedFsmService 1.0
+};
+
+#endif // _EXTENDED_FSM_SERVICE_IDL_
+

Modified: branches/FSM4RTC/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
===================================================================
--- branches/FSM4RTC/OpenRTM-aist/src/lib/rtm/idl/Makefile.am	2017-01-31 01:39:01 UTC (rev 2905)
+++ branches/FSM4RTC/OpenRTM-aist/src/lib/rtm/idl/Makefile.am	2017-01-31 01:39:20 UTC (rev 2906)
@@ -10,7 +10,7 @@
 SUBDIRS = . device_interfaces
 
 IDLC = @IDLC@
-IDLFLAGS = @IDL_FLAGS@
+IDLFLAGS = @IDL_FLAGS@ -I.
 LIBS = @LIBS@
 AM_CPPFLAGS=-I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/rtm
 AM_LDFLAGS=-L$(top_builddir)/src/lib/rtm -L$(top_builddir)/src/lib/rtm/idl
@@ -27,6 +27,7 @@
 	BasicDataType.idl     \
 	DataPort.idl          \
 	ExtendedDataTypes.idl \
+	ExtendedFsmService.idl\
 	InterfaceDataTypes.idl
 endif
 
@@ -80,6 +81,7 @@
         BasicDataTypeSkel.h     \
         DataPortSkel.h          \
         ExtendedDataTypesSkel.h \
+        ExtendedFsmServiceSkel.h\
         InterfaceDataTypesSkel.h
 ORB_SRC = $(RTORB_SRC)
 endif
@@ -140,6 +142,7 @@
 	echo '// This IDL file is for only RtORB' > OpenRTM-aist.idl
 	echo '#include "BasicDataType.idl"' >> OpenRTM-aist.idl
 	echo '#include "ExtendedDataTypes.idl"' >> OpenRTM-aist.idl
+	echo '#include "ExtendedFsmService.idl"' >> OpenRTM-aist.idl
 	echo '#include "RTC.idl"' >> OpenRTM-aist.idl
 	echo '#include "OpenRTM.idl"' >> OpenRTM-aist.idl
 	echo '#pragma ""' >> OpenRTM-aist.idl

Modified: branches/FSM4RTC/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/extended_fsm/Makefile.am
===================================================================
--- branches/FSM4RTC/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/extended_fsm/Makefile.am	2017-01-31 01:39:01 UTC (rev 2905)
+++ branches/FSM4RTC/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/extended_fsm/Makefile.am	2017-01-31 01:39:20 UTC (rev 2906)
@@ -13,7 +13,6 @@
 src:
 	cp -p $(top_srcdir)/src/ext/sdo/extended_fsm/*.cpp .
 	cp -p $(top_srcdir)/src/ext/sdo/extended_fsm/*.h .
-	cp -p $(top_srcdir)/src/ext/sdo/extended_fsm/*.idl .
 	qkc -O- -ms *.cpp
 	qkc -O- -ms *.h
 	qkc -O- -ms *.idl