[openrtm-commit:01254] r2449 - in branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest: FsmServant FsmServiceServant ModeCapableServant ModeServant MonitoringServant MultiModeComponentActionServant MultiModeObjectServant OrganizationServant RTObjectServant SDOServant SDOServiceServant SDOSystemElementServant

openrtm @ openrtm.org openrtm @ openrtm.org
2014年 2月 12日 (水) 10:19:23 JST


Author: win-ei
Date: 2014-02-12 10:19:23 +0900 (Wed, 12 Feb 2014)
New Revision: 2449

Modified:
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/FsmServant/Makefile.am
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/FsmServiceServant/Makefile.am
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/ModeCapableServant/Makefile.am
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/ModeServant/Makefile.am
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/MonitoringServant/Makefile.am
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/MultiModeComponentActionServant/Makefile.am
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/MultiModeObjectServant/Makefile.am
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/OrganizationServant/Makefile.am
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/RTObjectServant/Makefile.am
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/SDOServant/Makefile.am
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/SDOServiceServant/Makefile.am
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/SDOSystemElementServant/Makefile.am
Log:
Daily work.

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/FsmServant/Makefile.am
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/FsmServant/Makefile.am	2014-02-12 00:42:32 UTC (rev 2448)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/FsmServant/Makefile.am	2014-02-12 01:19:23 UTC (rev 2449)
@@ -28,6 +28,7 @@
 AM_CPPFLAGS += -I$(target_srcdir)
 AM_CPPFLAGS += -I$(open_rtm_dir)
 AM_CPPFLAGS += -I$(open_rtm_dir)/rtc/corba/idl
+AM_CPPFLAGS += -I../../../../../../coil/posix
 
 AM_LDFLAGS = -L.
 AM_LDFLAGS += -L$(open_rtm_dir)/coil/lib
@@ -50,7 +51,7 @@
 FsmServantTests_LDADD  += -lomnithread
 FsmServantTests_LDADD  += -lomniDynamic4
 FsmServantTests_LDADD  += -lcoil
-#FsmServantTests_LDADD  += -lcppunit
+FsmServantTests_LDADD  += -lcppunit
 FsmServantTests_LDADD  += $(target_srcdir)/FsmServant.o
 FsmServantTests_LDADD  += $(target_srcdir)/RTCTypeConversion.o
 FsmServantTests_LDADD  += $(target_srcdir)/SDOPackageTypeConversion.o

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/FsmServiceServant/Makefile.am
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/FsmServiceServant/Makefile.am	2014-02-12 00:42:32 UTC (rev 2448)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/FsmServiceServant/Makefile.am	2014-02-12 01:19:23 UTC (rev 2449)
@@ -28,6 +28,7 @@
 AM_CPPFLAGS += -I$(target_srcdir)
 AM_CPPFLAGS += -I$(open_rtm_dir)
 AM_CPPFLAGS += -I$(open_rtm_dir)/rtc/corba/idl
+AM_CPPFLAGS += -I../../../../../../coil/posix
 
 AM_LDFLAGS = -L.
 AM_LDFLAGS += -L$(open_rtm_dir)/coil/lib
@@ -50,11 +51,10 @@
 FsmServiceServantTests_LDADD  += -lomnithread
 FsmServiceServantTests_LDADD  += -lomniDynamic4
 FsmServiceServantTests_LDADD  += -lcoil
-#FsmServiceServantTests_LDADD  += -lcppunit
+FsmServiceServantTests_LDADD  += -lcppunit
 FsmServiceServantTests_LDADD  += $(target_srcdir)/FsmServiceServant.o
 FsmServiceServantTests_LDADD  += $(target_srcdir)/RTCTypeConversion.o
 FsmServiceServantTests_LDADD  += $(target_srcdir)/SDOPackageTypeConversion.o
-
 FsmServiceServantTests_LDADD  += $(target_srcdir)/SDOServiceServant.o
 
 # all

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/ModeCapableServant/Makefile.am
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/ModeCapableServant/Makefile.am	2014-02-12 00:42:32 UTC (rev 2448)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/ModeCapableServant/Makefile.am	2014-02-12 01:19:23 UTC (rev 2449)
@@ -28,6 +28,7 @@
 AM_CPPFLAGS += -I$(target_srcdir)
 AM_CPPFLAGS += -I$(open_rtm_dir)
 AM_CPPFLAGS += -I$(open_rtm_dir)/rtc/corba/idl
+AM_CPPFLAGS += -I../../../../../../coil/posix
 
 AM_LDFLAGS = -L.
 AM_LDFLAGS += -L$(open_rtm_dir)/coil/lib
@@ -50,7 +51,7 @@
 ModeCapableServantTests_LDADD  += -lomnithread
 ModeCapableServantTests_LDADD  += -lomniDynamic4
 ModeCapableServantTests_LDADD  += -lcoil
-#ModeCapableServantTests_LDADD  += -lcppunit
+ModeCapableServantTests_LDADD  += -lcppunit
 ModeCapableServantTests_LDADD  += $(target_srcdir)/ModeCapableServant.o
 ModeCapableServantTests_LDADD  += $(target_srcdir)/RTCTypeConversion.o
 ModeCapableServantTests_LDADD  += $(target_srcdir)/SDOPackageTypeConversion.o

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/ModeServant/Makefile.am
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/ModeServant/Makefile.am	2014-02-12 00:42:32 UTC (rev 2448)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/ModeServant/Makefile.am	2014-02-12 01:19:23 UTC (rev 2449)
@@ -28,6 +28,7 @@
 AM_CPPFLAGS += -I$(target_srcdir)
 AM_CPPFLAGS += -I$(open_rtm_dir)
 AM_CPPFLAGS += -I$(open_rtm_dir)/rtc/corba/idl
+AM_CPPFLAGS += -I../../../../../../coil/posix
 
 AM_LDFLAGS = -L.
 AM_LDFLAGS += -L$(open_rtm_dir)/coil/lib
@@ -50,7 +51,7 @@
 ModeServantTests_LDADD  += -lomnithread
 ModeServantTests_LDADD  += -lomniDynamic4
 ModeServantTests_LDADD  += -lcoil
-#ModeServantTests_LDADD  += -lcppunit
+ModeServantTests_LDADD  += -lcppunit
 ModeServantTests_LDADD  += $(target_srcdir)/ModeServant.o
 ModeServantTests_LDADD  += $(target_srcdir)/RTCTypeConversion.o
 ModeServantTests_LDADD  += $(target_srcdir)/SDOPackageTypeConversion.o

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/MonitoringServant/Makefile.am
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/MonitoringServant/Makefile.am	2014-02-12 00:42:32 UTC (rev 2448)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/MonitoringServant/Makefile.am	2014-02-12 01:19:23 UTC (rev 2449)
@@ -28,6 +28,7 @@
 AM_CPPFLAGS += -I$(target_srcdir)
 AM_CPPFLAGS += -I$(open_rtm_dir)
 AM_CPPFLAGS += -I$(open_rtm_dir)/rtc/corba/idl
+AM_CPPFLAGS += -I../../../../../../coil/posix
 
 AM_LDFLAGS = -L.
 AM_LDFLAGS += -L$(open_rtm_dir)/coil/lib
@@ -50,7 +51,7 @@
 MonitoringServantTests_LDADD  += -lomnithread
 MonitoringServantTests_LDADD  += -lomniDynamic4
 MonitoringServantTests_LDADD  += -lcoil
-#MonitoringServantTests_LDADD  += -lcppunit
+MonitoringServantTests_LDADD  += -lcppunit
 MonitoringServantTests_LDADD  += $(target_srcdir)/MonitoringServant.o
 MonitoringServantTests_LDADD  += $(target_srcdir)/RTCTypeConversion.o
 MonitoringServantTests_LDADD  += $(target_srcdir)/SDOPackageTypeConversion.o

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/MultiModeComponentActionServant/Makefile.am
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/MultiModeComponentActionServant/Makefile.am	2014-02-12 00:42:32 UTC (rev 2448)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/MultiModeComponentActionServant/Makefile.am	2014-02-12 01:19:23 UTC (rev 2449)
@@ -28,6 +28,7 @@
 AM_CPPFLAGS += -I$(target_srcdir)
 AM_CPPFLAGS += -I$(open_rtm_dir)
 AM_CPPFLAGS += -I$(open_rtm_dir)/rtc/corba/idl
+AM_CPPFLAGS += -I../../../../../../coil/posix
 
 AM_LDFLAGS = -L.
 AM_LDFLAGS += -L$(open_rtm_dir)/coil/lib
@@ -50,7 +51,7 @@
 MultiModeComponentActionServantTests_LDADD  += -lomnithread
 MultiModeComponentActionServantTests_LDADD  += -lomniDynamic4
 MultiModeComponentActionServantTests_LDADD  += -lcoil
-#MultiModeComponentActionServantTests_LDADD  += -lcppunit
+MultiModeComponentActionServantTests_LDADD  += -lcppunit
 MultiModeComponentActionServantTests_LDADD  += $(target_srcdir)/MultiModeComponentActionServant.o
 MultiModeComponentActionServantTests_LDADD  += $(target_srcdir)/RTCTypeConversion.o
 MultiModeComponentActionServantTests_LDADD  += $(target_srcdir)/SDOPackageTypeConversion.o

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/MultiModeObjectServant/Makefile.am
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/MultiModeObjectServant/Makefile.am	2014-02-12 00:42:32 UTC (rev 2448)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/MultiModeObjectServant/Makefile.am	2014-02-12 01:19:23 UTC (rev 2449)
@@ -28,6 +28,7 @@
 AM_CPPFLAGS += -I$(target_srcdir)
 AM_CPPFLAGS += -I$(open_rtm_dir)
 AM_CPPFLAGS += -I$(open_rtm_dir)/rtc/corba/idl
+AM_CPPFLAGS += -I../../../../../../coil/posix
 
 AM_LDFLAGS = -L.
 AM_LDFLAGS += -L$(open_rtm_dir)/coil/lib
@@ -50,7 +51,7 @@
 MultiModeObjectServantTests_LDADD  += -lomnithread
 MultiModeObjectServantTests_LDADD  += -lomniDynamic4
 MultiModeObjectServantTests_LDADD  += -lcoil
-#MultiModeObjectServantTests_LDADD  += -lcppunit
+MultiModeObjectServantTests_LDADD  += -lcppunit
 MultiModeObjectServantTests_LDADD  += $(target_srcdir)/MultiModeObjectServant.o
 MultiModeObjectServantTests_LDADD  += $(target_srcdir)/RTCTypeConversion.o
 MultiModeObjectServantTests_LDADD  += $(target_srcdir)/SDOPackageTypeConversion.o

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/OrganizationServant/Makefile.am
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/OrganizationServant/Makefile.am	2014-02-12 00:42:32 UTC (rev 2448)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/OrganizationServant/Makefile.am	2014-02-12 01:19:23 UTC (rev 2449)
@@ -28,6 +28,7 @@
 AM_CPPFLAGS += -I$(target_srcdir)
 AM_CPPFLAGS += -I$(open_rtm_dir)
 AM_CPPFLAGS += -I$(open_rtm_dir)/rtc/corba/idl
+AM_CPPFLAGS += -I../../../../../../coil/posix
 
 AM_LDFLAGS = -L.
 AM_LDFLAGS += -L$(open_rtm_dir)/coil/lib
@@ -50,7 +51,7 @@
 OrganizationServantTests_LDADD  += -lomnithread
 OrganizationServantTests_LDADD  += -lomniDynamic4
 OrganizationServantTests_LDADD  += -lcoil
-#OrganizationServantTests_LDADD  += -lcppunit
+OrganizationServantTests_LDADD  += -lcppunit
 OrganizationServantTests_LDADD  += $(target_srcdir)/OrganizationServant.o
 OrganizationServantTests_LDADD  += $(target_srcdir)/RTCTypeConversion.o
 OrganizationServantTests_LDADD  += $(target_srcdir)/SDOPackageTypeConversion.o

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/RTObjectServant/Makefile.am
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/RTObjectServant/Makefile.am	2014-02-12 00:42:32 UTC (rev 2448)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/RTObjectServant/Makefile.am	2014-02-12 01:19:23 UTC (rev 2449)
@@ -28,6 +28,7 @@
 AM_CPPFLAGS += -I$(target_srcdir)
 AM_CPPFLAGS += -I$(open_rtm_dir)
 AM_CPPFLAGS += -I$(open_rtm_dir)/rtc/corba/idl
+AM_CPPFLAGS += -I../../../../../../coil/posix
 
 AM_LDFLAGS = -L.
 AM_LDFLAGS += -L$(open_rtm_dir)/coil/lib
@@ -50,7 +51,7 @@
 RTObjectServantTests_LDADD  += -lomnithread
 RTObjectServantTests_LDADD  += -lomniDynamic4
 RTObjectServantTests_LDADD  += -lcoil
-#RTObjectServantTests_LDADD  += -lcppunit
+RTObjectServantTests_LDADD  += -lcppunit
 RTObjectServantTests_LDADD  += $(target_srcdir)/RTObjectServant.o
 RTObjectServantTests_LDADD  += $(target_srcdir)/RTCTypeConversion.o
 RTObjectServantTests_LDADD  += $(target_srcdir)/SDOPackageTypeConversion.o

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/SDOServant/Makefile.am
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/SDOServant/Makefile.am	2014-02-12 00:42:32 UTC (rev 2448)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/SDOServant/Makefile.am	2014-02-12 01:19:23 UTC (rev 2449)
@@ -28,6 +28,7 @@
 AM_CPPFLAGS += -I$(target_srcdir)
 AM_CPPFLAGS += -I$(open_rtm_dir)
 AM_CPPFLAGS += -I$(open_rtm_dir)/rtc/corba/idl
+AM_CPPFLAGS += -I../../../../../../coil/posix
 
 AM_LDFLAGS = -L.
 AM_LDFLAGS += -L$(open_rtm_dir)/coil/lib
@@ -50,7 +51,7 @@
 SDOServantTests_LDADD  += -lomnithread
 SDOServantTests_LDADD  += -lomniDynamic4
 SDOServantTests_LDADD  += -lcoil
-#SDOServantTests_LDADD  += -lcppunit
+SDOServantTests_LDADD  += -lcppunit
 SDOServantTests_LDADD  += $(target_srcdir)/SDOServant.o
 SDOServantTests_LDADD  += $(target_srcdir)/RTCTypeConversion.o
 SDOServantTests_LDADD  += $(target_srcdir)/SDOPackageTypeConversion.o

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/SDOServiceServant/Makefile.am
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/SDOServiceServant/Makefile.am	2014-02-12 00:42:32 UTC (rev 2448)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/SDOServiceServant/Makefile.am	2014-02-12 01:19:23 UTC (rev 2449)
@@ -28,6 +28,7 @@
 AM_CPPFLAGS += -I$(target_srcdir)
 AM_CPPFLAGS += -I$(open_rtm_dir)
 AM_CPPFLAGS += -I$(open_rtm_dir)/rtc/corba/idl
+AM_CPPFLAGS += -I../../../../../../coil/posix
 
 AM_LDFLAGS = -L.
 AM_LDFLAGS += -L$(open_rtm_dir)/coil/lib
@@ -50,7 +51,7 @@
 SDOServiceServantTests_LDADD  += -lomnithread
 SDOServiceServantTests_LDADD  += -lomniDynamic4
 SDOServiceServantTests_LDADD  += -lcoil
-#SDOServiceServantTests_LDADD  += -lcppunit
+SDOServiceServantTests_LDADD  += -lcppunit
 SDOServiceServantTests_LDADD  += $(target_srcdir)/SDOServiceServant.o
 SDOServiceServantTests_LDADD  += $(target_srcdir)/RTCTypeConversion.o
 SDOServiceServantTests_LDADD  += $(target_srcdir)/SDOPackageTypeConversion.o

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/SDOSystemElementServant/Makefile.am
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/SDOSystemElementServant/Makefile.am	2014-02-12 00:42:32 UTC (rev 2448)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/SDOSystemElementServant/Makefile.am	2014-02-12 01:19:23 UTC (rev 2449)
@@ -28,6 +28,7 @@
 AM_CPPFLAGS += -I$(target_srcdir)
 AM_CPPFLAGS += -I$(open_rtm_dir)
 AM_CPPFLAGS += -I$(open_rtm_dir)/rtc/corba/idl
+AM_CPPFLAGS += -I../../../../../../coil/posix
 
 AM_LDFLAGS = -L.
 AM_LDFLAGS += -L$(open_rtm_dir)/coil/lib
@@ -50,7 +51,7 @@
 SDOSystemElementServantTests_LDADD  += -lomnithread
 SDOSystemElementServantTests_LDADD  += -lomniDynamic4
 SDOSystemElementServantTests_LDADD  += -lcoil
-#SDOSystemElementServantTests_LDADD  += -lcppunit
+SDOSystemElementServantTests_LDADD  += -lcppunit
 SDOSystemElementServantTests_LDADD  += $(target_srcdir)/SDOSystemElementServant.o
 SDOSystemElementServantTests_LDADD  += $(target_srcdir)/RTCTypeConversion.o
 SDOSystemElementServantTests_LDADD  += $(target_srcdir)/SDOPackageTypeConversion.o



More information about the openrtm-commit mailing list