[openrtm-commit:01230] r2425 - in branches/work_ForDoil/OpenRTM-aist: . src/lib/doil/utils/omniidl_be/tests src/lib/doil/utils/omniidl_be/tests/ConfigurationProxy

[openrtm ＠ openrtm.org]

Author: win-ei
Date: 2014-02-09 17:58:59 +0900 (Sun, 09 Feb 2014)
New Revision: 2425

Modified:
   branches/work_ForDoil/OpenRTM-aist/configure.ac
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/ConfigurationProxy/Makefile.am
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/Makefile
Log:
Daily work.

Modified: branches/work_ForDoil/OpenRTM-aist/configure.ac
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/configure.ac	2014-02-08 13:54:53 UTC (rev 2424)
+++ branches/work_ForDoil/OpenRTM-aist/configure.ac	2014-02-09 08:58:59 UTC (rev 2425)
@@ -1715,6 +1715,7 @@
 	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/stubs/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/utils/omniidl_be/tests/ConfigurationProxy/Makefile.am
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/ConfigurationProxy/Makefile.am	2014-02-08 13:54:53 UTC (rev 2424)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/ConfigurationProxy/Makefile.am	2014-02-09 08:58:59 UTC (rev 2425)
@@ -20,16 +20,18 @@
 IDLFLAGS = @IDL_FLAGS@
 LIBS = @LIBS@
 
+
 AM_CPPFLAGS= -I.                                    \
 	-I$(includedir)                             \
 	-I$(top_builddir)                           \
 	-I.                                         \
 	-I../                                       \
         -I$(top_builddir)/../../../../              \
-        -I$(top_builddir)/../../../../rtm           \
-        -I$(top_builddir)/../../../../coil/include  \
-        -I$(top_builddir)/../../../../rtc/corba/idl \
-        -I$(top_builddir)/../../../../rtc/corba     \
+        -I../../../../../           \
+        -I../../../../../rtm           \
+        -I../../../../../coil/include  \
+        -I../../../../../rtc/corba/idl \
+        -I../../../../../rtc/corba     \
         -I/usr/include/                             \
         -I/usr/include/omniORB4/
 
@@ -39,22 +41,34 @@
 
 
 IDL_SOURCES = \
-        $(top_builddir)/../../../../rtc/corba/idl/SDOPackage.idl \
-        $(top_builddir)/../../../../rtc/corba/idl/RTC.idl        \
-        $(top_builddir)/../../../../rtc/corba/idl/OpenRTM.idl 
+        ../../../../../rtc/corba/idl/SDOPackage.idl \
+        ../../../../../rtc/corba/idl/RTC.idl        \
+        ../../../../../rtc/corba/idl/OpenRTM.idl 
+#        $(top_builddir)/../../../../rtc/corba/idl/SDOPackage.idl \
+#        $(top_builddir)/../../../../rtc/corba/idl/RTC.idl        \
+#        $(top_builddir)/../../../../rtc/corba/idl/OpenRTM.idl 
 
 noinst_PROGRAMS = ConfigurationProxyTests
 
 ConfigurationProxyTests_SOURCES = \
         ../TestRunner.cpp                                       \
 	$(IDL_SOURCES:.idl=Skel.cpp)                            \
-        $(top_builddir)/../../../../doil/corba/CORBAManager.cpp \
-        $(top_builddir)/../../../../doil/ORBManager.cpp         \
-        $(top_builddir)/../../../../rtm/NVUtil.cpp              \
-        $(top_builddir)/RTCTypeConversion.cpp                   \
-        $(top_builddir)/SDOPackageTypeConversion.cpp            \
-        $(top_builddir)/ConfigurationProxy.cpp \
+        ../../../../../doil/corba/CORBAManager.cpp \
+        ../../../../../doil/ORBManager.cpp         \
+        ../../../../../rtm/NVUtil.cpp              \
+        ../RTCTypeConversion.cpp                   \
+        ../SDOPackageTypeConversion.cpp            \
+        ../ConfigurationProxy.cpp \
         ConfigurationProxyTests.cpp
+
+#        $(top_builddir)/../../../../doil/corba/CORBAManager.cpp \
+#        $(top_builddir)/../../../../doil/ORBManager.cpp         \
+#        $(top_builddir)/../../../../rtm/NVUtil.cpp              \
+#        $(top_builddir)/RTCTypeConversion.cpp                   \
+#        $(top_builddir)/SDOPackageTypeConversion.cpp            \
+#        $(top_builddir)/ConfigurationProxy.cpp \
+#
+
 ConfigurationProxyTests_LDFLAGS = -L$(libdir)
 ConfigurationProxyTests_LDADD   = \
          -lcppunit                                 \

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 13:54:53 UTC (rev 2424)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/Makefile	2014-02-09 08:58:59 UTC (rev 2425)
@@ -80,15 +80,28 @@
 		-Wbcorbaadapter -Wbimplicit \
 		-Wbans=CORBA ./RTC.idl
 	$(OMNIIDL) -bdoil \
-		-Wbcorbaservant -Wbimplicit \
+		-Wbcorbaadapter -Wbimplicit \
 		-Wbans=CORBA ./SDOPackage.idl
+#	$(OMNIIDL) -bdoil \
+#		-Wbcorbaservant -Wbimplicit \
+#		-Wbans=CORBA ./SDOPackage.idl
 	g++ -I../../../../ -I../../../../coil/include *.h
 
+proxy:
+	rm -f *.gch
+	$(OMNIIDL) -bdoil -Wbi=SDOPackageTypes.h \
+		-Wbcorbaproxy -Wbimplicit \
+		-Wbans=CORBA ./RTC.idl
+	$(OMNIIDL) -bdoil \
+		-Wbcorbaproxy -Wbimplicit \
+		-Wbans=CORBA ./SDOPackage.idl
+#	g++ $(CXXFLAGS) *.h
 
 clean:
 	rm -f *~
 	rm -f *Servant*
 	rm -f *Adapter*
+	rm -f *Proxy*
 	rm -f *TypeConversion*
 	rm -f *Types*
 	rm -f I*.h