[openrtm-commit:02979] r3113 - in trunk/OpenRTM-aist: . examples src/ext/sdo/fsm4rtc_observer src/lib src/lib/rtm

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2017-12-11 06:02:52 +0900 (Mon, 11 Dec 2017)
New Revision: 3113

Added:
   trunk/OpenRTM-aist/examples/Fsm/
   trunk/OpenRTM-aist/src/lib/hrtm/
Modified:
   trunk/OpenRTM-aist/configure.ac
   trunk/OpenRTM-aist/src/ext/sdo/fsm4rtc_observer/
   trunk/OpenRTM-aist/src/lib/Makefile.am
   trunk/OpenRTM-aist/src/lib/rtm/Makefile.am
Log:
merged changes from branches/FSM4RTC/OpenRTM-aist r2763-2769:
[FSM4RTC,HRTM,->RELENG_2_0] Some dummy headers have been added for HRTM porting. refs #3653
[FSM4RTC,HRTM,->RELENG_2_0] Fsm example code from hrtm has been added for HRTM porting. refs #3655
[FSM4RTC,HRTM,->RELENG_2_0] libRTC wrapper lib for libHRTM has been implemented. It still has some bugs. refs #3653
[FSM4RTC,HRTM,->RELENG_2_0] Fsm component build complete, but it still has some bugs.  refs #3655
[FSM4RTC,compat,->RELENG_2_0] Ignore Makefile and Makefile.in
[FSM4RTC,compat,->RELENG_2_0] ignore Makefile and Makefile.in
[FSM4RTC,compat,->RELENG_2_0] ignore Makefile and Makefile.in


Modified: trunk/OpenRTM-aist/configure.ac
===================================================================
--- trunk/OpenRTM-aist/configure.ac	2017-12-10 21:00:43 UTC (rev 3112)
+++ trunk/OpenRTM-aist/configure.ac	2017-12-10 21:02:52 UTC (rev 3113)
@@ -1605,6 +1605,7 @@
 	src/Makefile
 	src/lib/Makefile
 	src/lib/rtm/Makefile
+	src/lib/hrtm/Makefile
 	src/lib/rtm/idl/Makefile
 	src/lib/rtm/ext/Makefile
 	src/lib/rtm/idl/device_interfaces/Makefile
@@ -1696,6 +1697,7 @@
 	examples/Templates/Makefile
 	examples/Throughput/Makefile
 	examples/tests/Makefile
+	examples/Fsm/Makefile
 	docs/Makefile
 	win32/Makefile
 	win32/OpenRTM-aist/Makefile

Index: trunk/OpenRTM-aist/src/ext/sdo/fsm4rtc_observer
===================================================================
--- trunk/OpenRTM-aist/src/ext/sdo/fsm4rtc_observer	2017-12-10 21:00:43 UTC (rev 3112)
+++ trunk/OpenRTM-aist/src/ext/sdo/fsm4rtc_observer	2017-12-10 21:02:52 UTC (rev 3113)

Property changes on: trunk/OpenRTM-aist/src/ext/sdo/fsm4rtc_observer
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,3 ##
+Makefile.in
+Makefile
+
Modified: trunk/OpenRTM-aist/src/lib/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/Makefile.am	2017-12-10 21:00:43 UTC (rev 3112)
+++ trunk/OpenRTM-aist/src/lib/Makefile.am	2017-12-10 21:02:52 UTC (rev 3113)
@@ -5,4 +5,4 @@
 ## $Id$
 ##---------------------------------------------------------------------------
 
-SUBDIRS = coil rtm
+SUBDIRS = coil rtm hrtm

Modified: trunk/OpenRTM-aist/src/lib/rtm/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/Makefile.am	2017-12-10 21:00:43 UTC (rev 3112)
+++ trunk/OpenRTM-aist/src/lib/rtm/Makefile.am	2017-12-10 21:02:52 UTC (rev 3113)
@@ -50,13 +50,13 @@
 #	PortProfileHelper.cpp
 #	ObjectManager.cpp
 
-UTIL_SRC =                \
+UTIL_SRC =            \
 	CORBA_IORUtil.cpp \
 	NVUtil.cpp        \
 	RTCUtil.cpp       \
 	DefaultPeriodicTask.cpp
 
-MGR_SRC =                            \
+MGR_SRC =                        \
 	FactoryInit.cpp              \
 	CorbaNaming.cpp              \
 	Factory.cpp                  \
@@ -72,7 +72,7 @@
 	LocalServiceAdmin.cpp        \
 	ManagerActionListener.cpp
 
-COMP_SRC =                           \
+COMP_SRC =                       \
 	DataFlowComponentBase.cpp    \
 	ExecutionContextBase.cpp     \
 	ExecutionContextProfile.cpp  \
@@ -92,7 +92,7 @@
 	PeriodicECSharedComposite.cpp\
 	SimulatorExecutionContext.cpp 
 
-PORT_SRC =                           \
+PORT_SRC =                       \
 	InPortConnector.cpp          \
 	OutPortConnector.cpp         \
 	OutPortPullConnector.cpp     \