[openrtm-commit:01466] r2572 - in trunk/OpenRTM-aist/src/lib/rtm/idl: . test

openrtm ＠ openrtm.org openrtm ＠ openrtm.org
2014年 7月 23日 (水) 10:58:48 JST 

Author: kawauchi
Date: 2014-07-23 10:58:48 +0900 (Wed, 23 Jul 2014)
New Revision: 2572

Modified:
   trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
   trunk/OpenRTM-aist/src/lib/rtm/idl/libRTCSkel.vcproj.yaml
   trunk/OpenRTM-aist/src/lib/rtm/idl/test/Makefile
Log:
CameraCommonInterface.idl build settings have been updated.

Modified: trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am	2014-07-22 08:53:47 UTC (rev 2571)
+++ trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am	2014-07-23 01:58:48 UTC (rev 2572)
@@ -31,7 +31,7 @@
 	ManipulatorCommonInterface_DataTypes.idl  \
 	ManipulatorCommonInterface_Common.idl     \
 	ManipulatorCommonInterface_Middle.idl     \
-	Img.idl
+	CameraCommonInterface.idl
 endif
 
 SKEL_H   = $(IDL_SOURCES:.idl=Skel.h)
@@ -170,7 +170,7 @@
 	echo '#include "ManipulatorCommonInterface_DataTypes.idl"' >> OpenRTM-aist.idl
 	echo '#include "ManipulatorCommonInterface_Common.idl"' >> OpenRTM-aist.idl
 	echo '#include "ManipulatorCommonInterface_Middle.idl"' >> OpenRTM-aist.idl
-	echo '#include "Img.idl"' >> OpenRTM-aist.idl
+	echo '#include "CameraCommonInterface.idl"' >> OpenRTM-aist.idl
 
 idl-stamp: $(IDL_SOURCES)
 	@touch idl-stamp

Modified: trunk/OpenRTM-aist/src/lib/rtm/idl/libRTCSkel.vcproj.yaml
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/idl/libRTCSkel.vcproj.yaml	2014-07-22 08:53:47 UTC (rev 2571)
+++ trunk/OpenRTM-aist/src/lib/rtm/idl/libRTCSkel.vcproj.yaml	2014-07-23 01:58:48 UTC (rev 2572)
@@ -26,7 +26,7 @@
           makewrapper.py ManipulatorCommonInterface_DataTypes.idl
           makewrapper.py ManipulatorCommonInterface_Common.idl
           makewrapper.py ManipulatorCommonInterface_Middle.idl
-          makewrapper.py Img.idl
+          makewrapper.py CameraCommonInterface.idl
           omniidl -bcxx -Wba -nf BasicDataType.idl
           omniidl -bcxx -Wba -nf DataPort.idl
           omniidl -bcxx -Wba -nf Manager.idl
@@ -38,7 +38,7 @@
           omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
           omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
           omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
-          omniidl -bcxx -Wba -nf Img.idl

+          omniidl -bcxx -Wba -nf CameraCommonInterface.idl

     VCCLCompilerTool:
       - Key: Optimization
         Value: "0"
@@ -87,7 +87,7 @@
           makewrapper.py ManipulatorCommonInterface_DataTypes.idl
           makewrapper.py ManipulatorCommonInterface_Common.idl
           makewrapper.py ManipulatorCommonInterface_Middle.idl
-          makewrapper.py Img.idl
+          makewrapper.py CameraCommonInterface.idl
           omniidl -bcxx -Wba -nf BasicDataType.idl
           omniidl -bcxx -Wba -nf DataPort.idl
           omniidl -bcxx -Wba -nf Manager.idl
@@ -99,7 +99,7 @@
           omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
           omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
           omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
-          omniidl -bcxx -Wba -nf Img.idl

+          omniidl -bcxx -Wba -nf CameraCommonInterface.idl

     VC10_VCCLCompilerTool:
       - Key: Optimization
         Value: "Disabled"
@@ -146,7 +146,7 @@
           makewrapper.py ManipulatorCommonInterface_DataTypes.idl
           makewrapper.py ManipulatorCommonInterface_Common.idl
           makewrapper.py ManipulatorCommonInterface_Middle.idl
-          makewrapper.py Img.idl
+          makewrapper.py CameraCommonInterface.idl
           omniidl -bcxx -Wba -nf BasicDataType.idl
           omniidl -bcxx -Wba -nf DataPort.idl
           omniidl -bcxx -Wba -nf Manager.idl
@@ -158,7 +158,7 @@
           omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
           omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
           omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
-          omniidl -bcxx -Wba -nf Img.idl

+          omniidl -bcxx -Wba -nf CameraCommonInterface.idl

     VCCLCompilerTool:
       - Key: Optimization
         Value: "0"
@@ -207,7 +207,7 @@
           makewrapper.py ManipulatorCommonInterface_DataTypes.idl
           makewrapper.py ManipulatorCommonInterface_Common.idl
           makewrapper.py ManipulatorCommonInterface_Middle.idl
-          makewrapper.py Img.idl
+          makewrapper.py CameraCommonInterface.idl
           omniidl -bcxx -Wba -nf BasicDataType.idl
           omniidl -bcxx -Wba -nf DataPort.idl
           omniidl -bcxx -Wba -nf Manager.idl
@@ -219,7 +219,7 @@
           omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
           omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
           omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
-          omniidl -bcxx -Wba -nf Img.idl

+          omniidl -bcxx -Wba -nf CameraCommonInterface.idl

     VC10_VCCLCompilerTool:
       - Key: Optimization
         Value: "Disabled"
@@ -267,7 +267,7 @@
           makewrapper.py ManipulatorCommonInterface_DataTypes.idl
           makewrapper.py ManipulatorCommonInterface_Common.idl
           makewrapper.py ManipulatorCommonInterface_Middle.idl
-          makewrapper.py Img.idl
+          makewrapper.py CameraCommonInterface.idl
           omniidl -bcxx -Wba -nf BasicDataType.idl
           omniidl -bcxx -Wba -nf DataPort.idl
           omniidl -bcxx -Wba -nf Manager.idl
@@ -279,7 +279,7 @@
           omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
           omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
           omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
-          omniidl -bcxx -Wba -nf Img.idl

+          omniidl -bcxx -Wba -nf CameraCommonInterface.idl

     VCCLCompilerTool:
       - Key: PreprocessorDefinitions
         Value: "WIN32;NDEBUG;_LIB;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
@@ -322,7 +322,7 @@
           makewrapper.py ManipulatorCommonInterface_DataTypes.idl
           makewrapper.py ManipulatorCommonInterface_Common.idl
           makewrapper.py ManipulatorCommonInterface_Middle.idl
-          makewrapper.py Img.idl
+          makewrapper.py CameraCommonInterface.idl
           omniidl -bcxx -Wba -nf BasicDataType.idl
           omniidl -bcxx -Wba -nf DataPort.idl
           omniidl -bcxx -Wba -nf Manager.idl
@@ -334,7 +334,7 @@
           omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
           omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
           omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
-          omniidl -bcxx -Wba -nf Img.idl

+          omniidl -bcxx -Wba -nf CameraCommonInterface.idl

     VC10_VCCLCompilerTool:
       - Key: PreprocessorDefinitions
         Value: "WIN32;NDEBUG;_LIB;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
@@ -376,7 +376,7 @@
           makewrapper.py ManipulatorCommonInterface_DataTypes.idl
           makewrapper.py ManipulatorCommonInterface_Common.idl
           makewrapper.py ManipulatorCommonInterface_Middle.idl
-          makewrapper.py Img.idl
+          makewrapper.py CameraCommonInterface.idl
           omniidl -bcxx -Wba -nf BasicDataType.idl
           omniidl -bcxx -Wba -nf DataPort.idl
           omniidl -bcxx -Wba -nf Manager.idl
@@ -388,7 +388,7 @@
           omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
           omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
           omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
-          omniidl -bcxx -Wba -nf Img.idl

+          omniidl -bcxx -Wba -nf CameraCommonInterface.idl

     VCCLCompilerTool:
       - Key: PreprocessorDefinitions
         Value: "WIN32;NDEBUG;_LIB;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
@@ -431,7 +431,7 @@
           makewrapper.py ManipulatorCommonInterface_DataTypes.idl
           makewrapper.py ManipulatorCommonInterface_Common.idl
           makewrapper.py ManipulatorCommonInterface_Middle.idl
-          makewrapper.py Img.idl
+          makewrapper.py CameraCommonInterface.idl
           omniidl -bcxx -Wba -nf BasicDataType.idl
           omniidl -bcxx -Wba -nf DataPort.idl
           omniidl -bcxx -Wba -nf Manager.idl
@@ -443,7 +443,7 @@
           omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
           omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
           omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
-          omniidl -bcxx -Wba -nf Img.idl

+          omniidl -bcxx -Wba -nf CameraCommonInterface.idl

     VC10_VCCLCompilerTool:
       - Key: PreprocessorDefinitions
         Value: "WIN32;NDEBUG;_LIB;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"

Modified: trunk/OpenRTM-aist/src/lib/rtm/idl/test/Makefile
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/idl/test/Makefile	2014-07-22 08:53:47 UTC (rev 2571)
+++ trunk/OpenRTM-aist/src/lib/rtm/idl/test/Makefile	2014-07-23 01:58:48 UTC (rev 2572)
@@ -12,7 +12,7 @@
 	ManipulatorCommonInterface_DataTypes.idl  \
 	ManipulatorCommonInterface_Common.idl     \
 	ManipulatorCommonInterface_Middle.idl     \
-	Img.idl
+	CameraCommonInterface.idl
 
 omniidl:
 	rm  -rf omniidl
@@ -59,4 +59,4 @@
 	rm -rf rtorb
 	rm -rf orbitidl
 	rm -rf cxx python java
-	rm -rf _SDOPackage
\ No newline at end of file
+	rm -rf _SDOPackage

More information about the openrtm-commit mailing list