OpenRTM · n-ando · Dec 18, 2023 · Dec 15, 2023
diff --git a/examples/ConsoleIn/.appveyor.yml b/examples/ConsoleIn/.appveyor.yml
@@ -1,4 +1,4 @@
-version: '{build}'
+version: '{build}'
 clone_folder: c:\workspace\ConsoleIn
 platform:
 - x64

diff --git a/examples/ConsoleIn/CMakeLists.txt b/examples/ConsoleIn/CMakeLists.txt
@@ -18,7 +18,7 @@ set(PROJECT_SHORT_VER ${PROJECT_VERSION_MAJOR}${PROJECT_VERSION_MINOR}${PROJECT_
 set(PROJECT_DESCRIPTION "Console input component")
 set(PROJECT_VENDOR "AIST")
 set(PROJECT_MAINTAINER "Noriaki Ando <[email protected]>")
-set(PROJECT_TYPE "c++/examples")
+set(PROJECT_TYPE "c++/example")
 
 find_package(OpenRTM REQUIRED)
 set(RTM_VER ${OPENRTM_VERSION})
@@ -106,18 +106,19 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 
 # Set up installation directories
 if(WIN32)
-   set(OPENRTM_SHARE_PREFIX "Components/${PROJECT_TYPE}/${RTM_VC_VER}")
+   set(RTM_COMPONENT_PREFIX "Components/${PROJECT_TYPE}")
+   set(OPENRTM_SHARE_PREFIX "OpenRTM-aist/${RTM_VER}/${RTM_COMPONENT_PREFIX}")
+   set(INSTALL_PREFIX ${PROJECT_NAME})
    if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-      set(CMAKE_INSTALL_PREFIX "${OPENRTM_DIR}/${OPENRTM_SHARE_PREFIX}" CACHE PATH "..." FORCE)
+      set(CMAKE_INSTALL_PREFIX "${OPENRTM_DIR}/${RTM_COMPONENT_PREFIX}" CACHE PATH "..." FORCE)
    else()
-      set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/${RTM_VER}/${OPENRTM_SHARE_PREFIX}")
+      set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/${OPENRTM_SHARE_PREFIX}")
    endif()
-   set(INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME})
 else(WIN32)
    set(OPENRTM_SHARE_PREFIX "share/openrtm-${OPENRTM_VERSION_MAJOR}.${OPENRTM_VERSION_MINOR}")
    set(INSTALL_PREFIX "${OPENRTM_SHARE_PREFIX}/components/${PROJECT_TYPE}/${PROJECT_NAME}")
 endif(WIN32)
-       
+
 # Subdirectories
 add_subdirectory(cmake)
 if(BUILD_DOCUMENTATION)

diff --git a/examples/ConsoleIn/COPYING b/examples/ConsoleIn/COPYING
@@ -1,4 +1,4 @@
-                    GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>

diff --git a/examples/ConsoleIn/COPYING.LESSER b/examples/ConsoleIn/COPYING.LESSER
@@ -1,4 +1,4 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
+                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>

diff --git a/examples/ConsoleIn/README.md b/examples/ConsoleIn/README.md
@@ -1,4 +1,4 @@
-# ConsoleIn
+# ConsoleIn
 
 ## Overview
 
@@ -62,36 +62,12 @@ Console input component
     <td colspan="2"></td>
   </tr>
   <tr>
-    <td rowspan="4">on_activated</td>
-    <td colspan="2">implemented</td>
-    <tr>
-      <td>Description</td>
-      <td></td>
-    </tr>
-    <tr>
-      <td>PreCondition</td>
-      <td></td>
-    </tr>
-    <tr>
-      <td>PostCondition</td>
-      <td></td>
-    </tr>
+    <td>on_activated</td>
+    <td colspan="2"></td>
   </tr>
   <tr>
-    <td rowspan="4">on_deactivated</td>
-    <td colspan="2">implemented</td>
-    <tr>
-      <td>Description</td>
-      <td></td>
-    </tr>
-    <tr>
-      <td>PreCondition</td>
-      <td></td>
-    </tr>
-    <tr>
-      <td>PostCondition</td>
-      <td></td>
-    </tr>
+    <td>on_deactivated</td>
+    <td colspan="2"></td>
   </tr>
   <tr>
     <td rowspan="4">on_execute</td>

diff --git a/examples/ConsoleIn/RTC.xml b/examples/ConsoleIn/RTC.xml
@@ -16,8 +16,6 @@
         <rtc:OnExecute xsi:type="rtcDoc:action_status_doc" rtc:implemented="true"/>
         <rtc:OnStateUpdate xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
         <rtc:OnRateChanged xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
-        <rtc:OnAction xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
-        <rtc:OnModeChanged xsi:type="rtcDoc:action_status_doc" rtc:implemented="false"/>
     </rtc:Actions>
     <rtc:DataPorts xsi:type="rtcExt:dataport_ext" rtcExt:position="RIGHT" rtcExt:variableName="" rtc:unit="" rtc:subscriptionType="" rtc:dataflowType="" rtc:interfaceType="" rtc:idlFile="&lt;RTM_ROOT&gt;/rtm/idl/BasicDataType.idl" rtc:type="RTC::TimedLong" rtc:name="out" rtc:portType="DataOutPort"/>
     <rtc:Language xsi:type="rtcExt:language_ext" rtc:kind="C++"/>

diff --git a/examples/ConsoleIn/cmake/License.rtf b/examples/ConsoleIn/cmake/License.rtf
@@ -1,4 +1,4 @@
-{\rtf1\ansi\ansicpg932\deff0\deflang1033\deflangfe1041{\fonttbl{\f0\froman\fprq1\fcharset128 \'82\'6c\'82\'72 \'82\'6f\'83\'53\'83\'56\'83\'62\'83\'4e;}}
+{\rtf1\ansi\ansicpg932\deff0\deflang1033\deflangfe1041{\fonttbl{\f0\froman\fprq1\fcharset128 \'82\'6c\'82\'72 \'82\'6f\'83\'53\'83\'56\'83\'62\'83\'4e;}}
 {\*\generator Msftedit 5.41.15.1515;}\viewkind4\uc1\pard\lang1041\f0\fs20 LICENSE\par
 =======\par
 \par

diff --git a/examples/ConsoleIn/cmake/consolein.pc.in b/examples/ConsoleIn/cmake/consolein.pc.in
@@ -1,4 +1,4 @@
-# This file was generated by CMake for @PROJECT_NAME@
+# This file was generated by CMake for @PROJECT_NAME@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
 libdir=${prefix}/@LIB_INSTALL_DIR@

diff --git a/examples/ConsoleIn/doc/conf.py.in b/examples/ConsoleIn/doc/conf.py.in
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 #
 # ConsoleIn documentation build configuration file, created by
 # sphinx-quickstart on Mon Aug  8 11:28:05 2011.

diff --git a/examples/ConsoleIn/doc/doxyfile.in b/examples/ConsoleIn/doc/doxyfile.in
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.20
+# Doxyfile 1.8.20
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------

diff --git a/examples/ConsoleIn/idl/CMakeLists.txt b/examples/ConsoleIn/idl/CMakeLists.txt
@@ -15,26 +15,9 @@ macro(_COMPILE_IDL _idl_file)
     else(WIN32)
         set(_python_command "python3")
     endif(WIN32)
-
-    if(${OPENRTM_VERSION_MAJOR} LESS 2)
-        if(NOT WIN32)
-            execute_process(COMMAND rtm-config --prefix OUTPUT_VARIABLE OPENRTM_DIR
-            OUTPUT_STRIP_TRAILING_WHITESPACE)
-            execute_process(COMMAND rtm-config --idlflags OUTPUT_VARIABLE OPENRTM_IDLFLAGS
-            OUTPUT_STRIP_TRAILING_WHITESPACE)
-            separate_arguments(OPENRTM_IDLFLAGS)
-            execute_process(COMMAND rtm-config --idlc OUTPUT_VARIABLE OPENRTM_IDLC
-            OUTPUT_STRIP_TRAILING_WHITESPACE)
-            set(_rtm_skelwrapper_command "rtm-skelwrapper")
-        else(NOT WIN32)
-            set(_rtm_skelwrapper_command "rtm-skelwrapper.py")
-        endif(NOT WIN32)
-        set(OPENRTM_IDL_WRAPPER ${_rtm_skelwrapper_command})
-	set(OPENRTM_IDL_WRAPPER_FLAGS --include-dir= --skel-suffix=Skel --stub-suffix=Stub --idl-file=${_idl}.idl)
-    endif()
 
     add_custom_command(OUTPUT ${${_idl_srcs_var}}
-        COMMAND ${_python_command} ${OPENRTM_DIR}/bin/${_rtm_skelwrapper_command} --include-dir= --skel-suffix=Skel --stub-suffix=Stub --idl-file=${_idl}.idl
+        COMMAND ${_python_command} ${OPENRTM_DIR}/bin/${OPENRTM_IDL_WRAPPER} ${OPENRTM_IDL_WRAPPER_FLAGS} --idl-file=${_idl}.idl
         COMMAND ${OPENRTM_IDLC} ${OPENRTM_IDLFLAGS} ${_idl_file}
         WORKING_DIRECTORY ${CURRENT_BINARY_DIR}
         DEPENDS ${_idl_file}

diff --git a/examples/ConsoleIn/include/ConsoleIn/ConsoleIn.h b/examples/ConsoleIn/include/ConsoleIn/ConsoleIn.h
@@ -1,17 +1,11 @@
-// -*- C++ -*-
+// -*- C++ -*-
 // <rtc-template block="description">
-/*! \mainpage
- *
- * @author Noriaki Ando <[email protected]>
- *
- */
-
- /*!
+/*!
  * @file  ConsoleIn.h
  * @brief Console input component
- * @date  $Date$
  *
- * $Id$
+ * @author Noriaki Ando <[email protected]>
+ *
  */
 // </rtc-template>
 
@@ -180,7 +174,7 @@ class ConsoleIn
    * 
    * 
    */
-   // RTC::ReturnCode_t onActivated(RTC::UniqueId ec_id) override;
+  // RTC::ReturnCode_t onActivated(RTC::UniqueId ec_id) override;
 
   /***
    *
@@ -192,7 +186,7 @@ class ConsoleIn
    * 
    * 
    */
-   // RTC::ReturnCode_t onDeactivated(RTC::UniqueId ec_id) override;
+  // RTC::ReturnCode_t onDeactivated(RTC::UniqueId ec_id) override;
 
   /***
    *

diff --git a/examples/ConsoleIn/scripts/ubuntu_1804/Dockerfile b/examples/ConsoleIn/scripts/ubuntu_1804/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:18.04
 
 RUN apt-get update\
  && apt-get install -y --no-install-recommends\

diff --git a/examples/ConsoleIn/src/ConsoleIn.cpp b/examples/ConsoleIn/src/ConsoleIn.cpp
@@ -1,13 +1,11 @@
-// -*- C++ -*-
+// -*- C++ -*-
 // <rtc-template block="description">
 /*!
  * @file  ConsoleIn.cpp
  * @brief Console input component
- * @date $Date$
  *
  * @author Noriaki Ando <[email protected]>
  *
- * $Id$
  */
 // </rtc-template>
 
@@ -122,33 +120,30 @@ RTC::ReturnCode_t ConsoleIn::onFinalize()
 }
 */
 
-/*
-RTC::ReturnCode_t ConsoleIn::onStartup(RTC::UniqueId ec_id)
-{
-  return RTC::RTC_OK;
-}
-*/
 
-/*
-RTC::ReturnCode_t ConsoleIn::onShutdown(RTC::UniqueId ec_id)
-{
-  return RTC::RTC_OK;
-}
-*/
+//RTC::ReturnCode_t ConsoleIn::onStartup(RTC::UniqueId /*ec_id*/)
+//{
+//  return RTC::RTC_OK;
+//}
 
-/*
-RTC::ReturnCode_t ConsoleIn::onActivated(RTC::UniqueId ec_id)
-{
-  return RTC::RTC_OK;
-}
-*/
 
-/*
-RTC::ReturnCode_t ConsoleIn::onDeactivated(RTC::UniqueId ec_id)
-{
-  return RTC::RTC_OK;
-}
-*/
+//RTC::ReturnCode_t ConsoleIn::onShutdown(RTC::UniqueId /*ec_id*/)
+//{
+//  return RTC::RTC_OK;
+//}
+
+
+//RTC::ReturnCode_t ConsoleIn::onActivated(RTC::UniqueId /*ec_id*/)
+//{
+//  return RTC::RTC_OK;
+//}
+
+
+//RTC::ReturnCode_t ConsoleIn::onDeactivated(RTC::UniqueId /*ec_id*/)
+//{
+//  return RTC::RTC_OK;
+//}
+
 
 RTC::ReturnCode_t ConsoleIn::onExecute(RTC::UniqueId /*ec_id*/)
 {
@@ -172,40 +167,35 @@ RTC::ReturnCode_t ConsoleIn::onExecute(RTC::UniqueId /*ec_id*/)
   return RTC::RTC_OK;
 }
 
-/*
-RTC::ReturnCode_t ConsoleIn::onAborting(RTC::UniqueId ec_id)
-{
-  return RTC::RTC_OK;
-}
-*/
 
-/*
-RTC::ReturnCode_t ConsoleIn::onError(RTC::UniqueId ec_id)
-{
-  return RTC::RTC_OK;
-}
-*/
+//RTC::ReturnCode_t ConsoleIn::onAborting(RTC::UniqueId /*ec_id*/)
+//{
+//  return RTC::RTC_OK;
+//}
 
-/*
-RTC::ReturnCode_t ConsoleIn::onReset(RTC::UniqueId ec_id)
-{
-  return RTC::RTC_OK;
-}
-*/
 
-/*
-RTC::ReturnCode_t ConsoleIn::onStateUpdate(RTC::UniqueId ec_id)
-{
-  return RTC::RTC_OK;
-}
-*/
+//RTC::ReturnCode_t ConsoleIn::onError(RTC::UniqueId /*ec_id*/)
+//{
+//  return RTC::RTC_OK;
+//}
 
-/*
-RTC::ReturnCode_t ConsoleIn::onRateChanged(RTC::UniqueId ec_id)
-{
-  return RTC::RTC_OK;
-}
-*/
+
+//RTC::ReturnCode_t ConsoleIn::onReset(RTC::UniqueId /*ec_id*/)
+//{
+//  return RTC::RTC_OK;
+//}
+
+
+//RTC::ReturnCode_t ConsoleIn::onStateUpdate(RTC::UniqueId /*ec_id*/)
+//{
+//  return RTC::RTC_OK;
+//}
+
+
+//RTC::ReturnCode_t ConsoleIn::onRateChanged(RTC::UniqueId /*ec_id*/)
+//{
+//  return RTC::RTC_OK;
+//}
 
 
 
@@ -221,5 +211,3 @@ extern "C"
   }
 
 }
-
-
diff --git a/examples/ConsoleIn/src/ConsoleInComp.cpp b/examples/ConsoleIn/src/ConsoleInComp.cpp
@@ -1,13 +1,11 @@
-// -*- C++ -*-
+// -*- C++ -*-
 // <rtc-template block="description">
 /*!
  * @file ConsoleInComp.cpp
  * @brief Standalone component
- * @date $Date$
  *
  * @author Noriaki Ando <[email protected]>
  *
- * $Id$
  */
 // </rtc-template>
 

diff --git a/examples/ConsoleIn/test/include/ConsoleInTest/ConsoleInTest.h b/examples/ConsoleIn/test/include/ConsoleInTest/ConsoleInTest.h
@@ -1,11 +1,13 @@
-// -*- C++ -*-
+// -*- C++ -*-
+// <rtc-template block="description">
 /*!
  * @file  ConsoleInTest.h
- * @brief Console input component
- * @date  $Date$
+ * @brief Console input component (test code)
+ *
+ * @author Noriaki Ando <[email protected]>
  *
- * $Id$
  */
+// </rtc-template>
 
 #ifndef CONSOLEIN_TEST__H
 #define CONSOLEIN_TEST_H
@@ -113,7 +115,7 @@ class ConsoleInTest
    * 
    * 
    */
-   RTC::ReturnCode_t onActivated(RTC::UniqueId ec_id) override;
+  // RTC::ReturnCode_t onActivated(RTC::UniqueId ec_id) override;
 
   /***
    *
@@ -125,7 +127,7 @@ class ConsoleInTest
    * 
    * 
    */
-   RTC::ReturnCode_t onDeactivated(RTC::UniqueId ec_id) override;
+  // RTC::ReturnCode_t onDeactivated(RTC::UniqueId ec_id) override;
 
   /***
    *