[openrtm-commit:01225] r2420 - in branches/work_ForDoil/OpenRTM-aist: . src/lib/doil/corba src/lib/doil/utils/omniidl_be/tests src/lib/doil/utils/omniidl_be/tests/unitTest/ConfigurationServant

[openrtm ＠ openrtm.org]

Author: win-ei
Date: 2014-02-08 21:39:49 +0900 (Sat, 08 Feb 2014)
New Revision: 2420

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

Modified: branches/work_ForDoil/OpenRTM-aist/configure.ac
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/configure.ac	2014-02-08 02:31:24 UTC (rev 2419)
+++ branches/work_ForDoil/OpenRTM-aist/configure.ac	2014-02-08 12:39:49 UTC (rev 2420)
@@ -1716,6 +1716,8 @@
 	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
+	src/lib/doil/utils/omniidl_be/tests/unitTest/PortServiceServant/Makefile
+	src/lib/doil/utils/omniidl_be/tests/unitTest/ConfigurationServant/Makefile
 	])
 
 

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/corba/BasicTypeConversion.h
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/corba/BasicTypeConversion.h	2014-02-08 02:31:24 UTC (rev 2419)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/corba/BasicTypeConversion.h	2014-02-08 12:39:49 UTC (rev 2420)
@@ -88,7 +88,8 @@
 }
 
 
-inline bool local_to_corba(const std::string& _from, _CORBA_String_element::_CORBA_String_element _to)
+//inline bool local_to_corba(const std::string& _from, _CORBA_String_element::_CORBA_String_element _to)
+inline bool local_to_corba(const std::string& _from, ::_CORBA_String_element _to)
 {
   _to.out() = ::CORBA::string_dup(_from.c_str());
   return true;

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/Makefile
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/Makefile	2014-02-08 02:31:24 UTC (rev 2419)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/Makefile	2014-02-08 12:39:49 UTC (rev 2420)
@@ -1,5 +1,6 @@
 all: RTC
-OMNIIDL=PYTHONPATH=$(PYTHONPATH):../../ omniidl
+#OMNIIDL=PYTHONPATH=$(PYTHONPATH):../../ omniidl
+OMNIIDL=omniidl
 
 CXXFLAGS= \
 	-fPIC -c \

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/ConfigurationServant/Makefile.am
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/ConfigurationServant/Makefile.am	2014-02-08 02:31:24 UTC (rev 2419)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/ConfigurationServant/Makefile.am	2014-02-08 12:39:49 UTC (rev 2420)
@@ -20,14 +20,22 @@
 IDLFLAGS = @IDL_FLAGS@
 LIBS = @LIBS@
 
-open_rtm_dir = $(top_builddir)/../../../../..
-target_srcdir = $(top_builddir)/..
+#open_rtm_dir = $(top_builddir)/../../../../..
+open_rtm_dir = ../../../../../..
+#target_srcdir = $(top_builddir)/..
+target_srcdir = ../..
 
 AM_CPPFLAGS = -I.
 AM_CPPFLAGS += -I$(includedir)
 AM_CPPFLAGS += -I$(target_srcdir)
 AM_CPPFLAGS += -I$(open_rtm_dir)
 AM_CPPFLAGS += -I$(open_rtm_dir)/rtc/corba/idl
+AM_CPPFLAGS += -I../
+AM_CPPFLAGS += -I../../
+AM_CPPFLAGS += -I../../../../../../coil/posix
+AM_CPPFLAGS += -I../../../../../../
+AM_CPPFLAGS += -I/usr/include/omniORB4/
+AM_CPPFLAGS += -I/usr/include/omniORB4/internal/
 
 AM_LDFLAGS = -L.
 AM_LDFLAGS += -L$(open_rtm_dir)/coil/lib