[openrtm-commit:02921] r3076 - in trunk/OpenRTM-aist/src/ext: . sdo sdo/logger

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2017-11-17 15:26:54 +0900 (Fri, 17 Nov 2017)
New Revision: 3076

Added:
   trunk/OpenRTM-aist/src/ext/CMakeLists.txt
   trunk/OpenRTM-aist/src/ext/sdo/CMakeLists.txt
   trunk/OpenRTM-aist/src/ext/sdo/logger/CMakeLists.txt
Modified:
   trunk/OpenRTM-aist/src/ext/sdo/logger/Logger.idl
Log:
[incompat,bugfix,->RELENG_1_2] Modified Logger.idl.

Added: trunk/OpenRTM-aist/src/ext/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/ext/CMakeLists.txt	                        (rev 0)
+++ trunk/OpenRTM-aist/src/ext/CMakeLists.txt	2017-11-17 06:26:54 UTC (rev 3076)
@@ -0,0 +1,5 @@
+cmake_minimum_required (VERSION 2.6)
+
+add_subdirectory(sdo)
+
+

Added: trunk/OpenRTM-aist/src/ext/sdo/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/ext/sdo/CMakeLists.txt	                        (rev 0)
+++ trunk/OpenRTM-aist/src/ext/sdo/CMakeLists.txt	2017-11-17 06:26:54 UTC (rev 3076)
@@ -0,0 +1,5 @@
+cmake_minimum_required (VERSION 2.6)
+
+add_subdirectory(logger)
+
+

Added: trunk/OpenRTM-aist/src/ext/sdo/logger/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/ext/sdo/logger/CMakeLists.txt	                        (rev 0)
+++ trunk/OpenRTM-aist/src/ext/sdo/logger/CMakeLists.txt	2017-11-17 06:26:54 UTC (rev 3076)
@@ -0,0 +1,90 @@
+cmake_minimum_required (VERSION 2.6)
+
+project (LoggerConsumer)
+
+
+
+set(idl_name Logger)
+
+
+
+
+
+set(${idl_name}_DIR ${CMAKE_CURRENT_BINARY_DIR})
+set(${idl_name}_SKEL ${CMAKE_CURRENT_BINARY_DIR}/${idl_name}Skel.cpp ${CMAKE_CURRENT_BINARY_DIR}/${idl_name}Skel.h)
+set(${idl_name}_STUB ${CMAKE_CURRENT_BINARY_DIR}/${idl_name}Stub.cpp ${CMAKE_CURRENT_BINARY_DIR}/${idl_name}Stub.h)
+
+
+add_custom_command(
+		OUTPUT ${idl_name}Skel.cpp ${idl_name}Stub.cpp
+		COMMAND ${IDL_COMPILE_COMMAND} ${IDLCOMMAND_FLAGS} -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_SOURCE_DIR}/src/lib/rtm/idl ${CMAKE_CURRENT_SOURCE_DIR}/${idl_name}.idl
+		COMMAND python ${SKELWRAPPER_COMMAND} --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=${idl_name}.idl
+		WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+)
+add_custom_target(${idl_name}_TGT DEPENDS ${idl_name}Skel.cpp ${idl_name}Stub.cpp)
+
+
+
+message(STATUS ${ORB_LINK_DIR})
+link_directories(${ORB_LINK_DIR})
+include_directories(
+		${RTM_INCLUDE_DIR}
+		${ORB_INCLUDE_DIR}
+		${${idl_name}_DIR}
+		)
+
+ADD_DEFINITIONS(${ORB_C_FLAGS_LIST})
+
+
+set(target LoggerConsumer)
+
+set(srcs LoggerConsumer.cpp LoggerConsumer.h ${${idl_name}_STUB})
+
+
+if(VXWORKS AND NOT RTP)
+	set(standalone_srcs ${standalone_srcs} ${CMAKE_SOURCE_DIR}/src/lib/rtm/DataFlowComponentBase.cpp)
+	set(libs ${RTCSKEL_PROJECT_NAME})
+
+	add_executable(${target})
+	target_link_libraries(${target} ${libs})
+	add_dependencies(${target} ${RTM_PROJECT_NAME})
+	add_dependencies(${target} ${idl_name}_TGT)
+
+	install(TARGETS ${target} RUNTIME DESTINATION examples)
+else()
+	if(VXWORKS)
+		set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME} ${RTCSKEL_PROJECT_NAME})
+	else(VXWORKS)
+		set(libs ${RTM_PROJECT_NAME} ${ORB_LIBRARIES} ${COIL_PROJECT_NAME})
+	endif(VXWORKS)
+
+
+	add_library(${target} SHARED ${srcs})
+	target_link_libraries(${target} ${libs} ${RTM_LINKER_OPTION})
+	add_dependencies(${target} ${RTM_PROJECT_NAME})
+	add_dependencies(${target} ${idl_name}_TGT)
+	set_target_properties(${target} PROPERTIES PREFIX "")
+
+
+	if(WIN32)
+		install(TARGETS ${target} RUNTIME DESTINATION examples)
+	else(WIN32)
+		install(TARGETS ${target} LIBRARY DESTINATION examples)
+	endif(WIN32)
+endif()
+
+
+set_source_files_properties(${${idl_name}_STUB} PROPERTIES GENERATED 1)
+
+
+
+
+if(VXWORKS)
+	if(RTP)
+	else(RTP)	
+		set_target_properties(${target} PROPERTIES SUFFIX ".out")
+	endif(RTP)
+endif(VXWORKS)
+
+
+

Modified: trunk/OpenRTM-aist/src/ext/sdo/logger/Logger.idl
===================================================================
--- trunk/OpenRTM-aist/src/ext/sdo/logger/Logger.idl	2017-11-16 10:12:02 UTC (rev 3075)
+++ trunk/OpenRTM-aist/src/ext/sdo/logger/Logger.idl	2017-11-17 06:26:54 UTC (rev 3076)
@@ -79,15 +79,15 @@
    */
   enum LogLevel
   {
-    SILENT,
-    ERROR,
-    WARN,
-    INFO,
-    NORMAL,
-    DEBUG,
-    TRACE,
-    VERBOSE,
-    PARANOID
+    RTC_SILENT,
+    RTC_ERROR,
+    RTC_WARN,
+    RTC_INFO,
+    RTC_NORMAL,
+    RTC_DEBUG,
+    RTC_TRACE,
+    RTC_VERBOSE,
+    RTC_PARANOID
   };
 
   /*!