[openrtm-commit:01221] r2416 - in branches/work_ForDoil/OpenRTM-aist: . src/lib src/lib/doil src/lib/doil/corba src/lib/doil/ice src/lib/doil/tests src/lib/doil/utils/omniidl_be/tests/unitTest/ComponentActionServant

[openrtm ＠ openrtm.org]

Author: win-ei
Date: 2014-02-06 19:39:18 +0900 (Thu, 06 Feb 2014)
New Revision: 2416

Modified:
   branches/work_ForDoil/OpenRTM-aist/configure.ac
   branches/work_ForDoil/OpenRTM-aist/src/lib/Makefile.am
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/Makefile.am
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/corba/CORBAManager.h
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/ice/Ice.h
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/tests/Makefile.am
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/ComponentActionServant/Makefile.am
Log:
Daily work.

Modified: branches/work_ForDoil/OpenRTM-aist/configure.ac
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/configure.ac	2014-02-06 07:56:57 UTC (rev 2415)
+++ branches/work_ForDoil/OpenRTM-aist/configure.ac	2014-02-06 10:39:18 UTC (rev 2416)
@@ -1699,6 +1699,21 @@
 	win32/OpenRTM-aist/rtm/idl/Makefile
 	win32/OpenRTM-aist/installer/Makefile
 	win32/OpenRTM-aist/installer/Bitmaps/Makefile
+	src/lib/rtc/Makefile
+	src/lib/rtc/corba/Makefile
+	src/lib/rtc/corba/idl/Makefile
+	src/lib/doil/Makefile
+	src/lib/doil/utils/Makefile
+	src/lib/doil/utils/omniidl_be/Makefile
+	src/lib/doil/utils/omniidl_be/tests/ConfigurationProxy/Makefile
+	src/lib/doil/ice/Makefile
+	src/lib/doil/tests/Makefile
+	src/lib/doil/tests/ORBManager/Makefile
+	src/lib/doil/corba/Makefile
+	src/lib/doil/corba/tests/Makefile
+	src/lib/doil/corba/tests/CORBAManager/Makefile
+	src/lib/doil/utils/omniidl_be/tests/unitTest/Makefile
+	src/lib/doil/utils/omniidl_be/tests/unitTest/ComponentActionServant/Makefile
 	])
 
 

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/Makefile.am
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/Makefile.am	2014-02-06 07:56:57 UTC (rev 2415)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/Makefile.am	2014-02-06 10:39:18 UTC (rev 2416)
@@ -5,4 +5,4 @@
 ## $Id$
 ##---------------------------------------------------------------------------
 
-SUBDIRS = coil rtm
+SUBDIRS = coil rtm doil

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/Makefile.am
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/Makefile.am	2014-02-06 07:56:57 UTC (rev 2415)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/Makefile.am	2014-02-06 10:39:18 UTC (rev 2416)
@@ -7,7 +7,8 @@
 
 AUTOMAKE_OPTIONS = 1.4
 
-SUBDIRS = . utils corba ice tests
+#SUBDIRS = . utils corba ice tests
+SUBDIRS = . utils corba tests
 
 AM_CPPFLAGS=-I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/rtm -I$(top_srcdir)/src/lib/coil/include
 AM_LDFLAGS=-L$(top_builddir)/src/lib/doil

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/corba/CORBAManager.h
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/corba/CORBAManager.h	2014-02-06 07:56:57 UTC (rev 2415)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/corba/CORBAManager.h	2014-02-06 10:39:18 UTC (rev 2416)
@@ -26,7 +26,7 @@
 #include <doil/ProxyFactory.h>
 #include <doil/corba/CORBA.h>
 #include <doil/corba/CORBAServantBase.h>
-#include <doil/corba/CORBAProxyBase.h>
+//#include <doil/corba/CORBAProxyBase.h>
 #include <doil/ObjectManager.h>
 
 namespace doil

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/ice/Ice.h
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/ice/Ice.h	2014-02-06 07:56:57 UTC (rev 2415)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/ice/Ice.h	2014-02-06 10:39:18 UTC (rev 2416)
@@ -20,6 +20,6 @@
 #define DOIL_ICE_ICE_H
 
 #include <rtm/config_rtc.h>
-#include <Ice/Ice.h>
+//#include <Ice/Ice.h>
 
 #endif // DOIL_ICE_ICE_H

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/tests/Makefile.am
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/tests/Makefile.am	2014-02-06 07:56:57 UTC (rev 2415)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/tests/Makefile.am	2014-02-06 10:39:18 UTC (rev 2416)
@@ -5,8 +5,9 @@
 ## $Id$
 ##---------------------------------------------------------------------------
 
-SUBDIRS = \
-        ORBManager
+#SUBDIRS = \
+#        ORBManager
+SUBDIRS = 
 
 clean-local:
 	rm -f *~

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/ComponentActionServant/Makefile.am
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/ComponentActionServant/Makefile.am	2014-02-06 07:56:57 UTC (rev 2415)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/ComponentActionServant/Makefile.am	2014-02-06 10:39:18 UTC (rev 2416)
@@ -20,7 +20,8 @@
 IDLFLAGS = @IDL_FLAGS@
 LIBS = @LIBS@
 
-open_rtm_dir = $(top_builddir)/../../../../..
+#open_rtm_dir = $(top_builddir)/../../../../..
+open_rtm_dir = ../../../../../..
 target_srcdir = $(top_builddir)/..
 
 AM_CPPFLAGS = -I.
@@ -28,6 +29,7 @@
 AM_CPPFLAGS += -I$(target_srcdir)
 AM_CPPFLAGS += -I$(open_rtm_dir)
 AM_CPPFLAGS += -I$(open_rtm_dir)/rtc/corba/idl
+AM_CPPFLAGS += -I$(open_rtm_dir)/coil/posix
 
 AM_LDFLAGS = -L.
 AM_LDFLAGS += -L$(open_rtm_dir)/coil/lib