[openrtm-commit:02376] r673 - in branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder: lib src/jp/go/aist/rtm/rtcbuilder src/jp/go/aist/rtm/rtcbuilder/manager src/jp/go/aist/rtm/rtcbuilder/template/cmake src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake src/jp/go/aist/rtm/rtcbuilder/ui/editors test/jp/go/aist/rtm/rtcbuilder/_test/_100
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 2月 2日 (木) 19:29:27 JST
Author: ga
Date: 2017-02-02 19:29:27 +0900 (Thu, 02 Feb 2017)
New Revision: 673
Removed:
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/FindOpenRTM.cmake.vsl
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/FindOpenRTM.cmake.vsl
Modified:
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/lib/commons-beanutils-1.9.3.jar
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/lib/commons-collections-3.2.2.jar
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/lib/commons-digester-2.1.jar
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/lib/commons-logging-1.2.jar
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/lib/commons-scxml-0.9.jar
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CMakeGenerateManager.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/BasicEditorFormPage.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/FSMEditorFormPage.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXManipTest.java
Log:
Modified generated CMakeFile #3874, #3602
Modified Import/Export #3879
Property changes on: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/lib/commons-beanutils-1.9.3.jar
___________________________________________________________________
Deleted: svn:mime-type
- application/octet-stream
Property changes on: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/lib/commons-collections-3.2.2.jar
___________________________________________________________________
Deleted: svn:mime-type
- application/octet-stream
Property changes on: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/lib/commons-digester-2.1.jar
___________________________________________________________________
Deleted: svn:mime-type
- application/octet-stream
Property changes on: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/lib/commons-logging-1.2.jar
___________________________________________________________________
Deleted: svn:mime-type
- application/octet-stream
Property changes on: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/lib/commons-scxml-0.9.jar
___________________________________________________________________
Deleted: svn:mime-type
- application/octet-stream
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java 2017-02-02 10:28:20 UTC (rev 672)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java 2017-02-02 10:29:27 UTC (rev 673)
@@ -573,24 +573,14 @@
}
}
for( IdlFileParam idlFile : rtcParam.getProviderIdlPathes() ) {
- IFile idlTarget;
- if(rtcParam.getRtmVersion().equals(IRtcBuilderConstants.RTM_VERSION_100)) {
- idlTarget = project.getFile("idl" + File.separator + idlFile.getIdlFile());
- } else {
- idlTarget = project.getFile(idlFile.getIdlFile());
- }
+ IFile idlTarget = project.getFile("idl" + File.separator + idlFile.getIdlFile());
if( !idlTarget.getLocation().toOSString().equals(idlFile.getIdlPath()) ) {
idlTarget.delete(true, null);
idlTarget.create(new FileInputStream(idlFile.getIdlPath()), true, null);
}
}
for( IdlFileParam idlFile : rtcParam.getConsumerIdlPathes() ) {
- IFile idlTarget;
- if(rtcParam.getRtmVersion().equals(IRtcBuilderConstants.RTM_VERSION_100)) {
- idlTarget = project.getFile("idl" + File.separator + idlFile.getIdlFile());
- } else {
- idlTarget = project.getFile(idlFile.getIdlFile());
- }
+ IFile idlTarget = project.getFile("idl" + File.separator + idlFile.getIdlFile());
if( !idlTarget.getLocation().toOSString().equals(idlFile.getIdlPath()) ) {
idlTarget.delete(true, null);
idlTarget.create(new FileInputStream(idlFile.getIdlPath()), true, null);
@@ -599,12 +589,7 @@
//
for( String includedIdlFile : rtcParam.getIncludedIdls() ) {
File target = new File(includedIdlFile);
- IFile idlTarget;
- if(rtcParam.getRtmVersion().equals(IRtcBuilderConstants.RTM_VERSION_100)) {
- idlTarget = project.getFile("idl" + File.separator + target.getName());
- } else {
- idlTarget = project.getFile(target.getName());
- }
+ IFile idlTarget = project.getFile("idl" + File.separator + target.getName());
if( !idlTarget.getLocation().toOSString().equals(includedIdlFile) ) {
idlTarget.delete(true, null);
idlTarget.create(new FileInputStream(includedIdlFile), true, null);
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CMakeGenerateManager.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CMakeGenerateManager.java 2017-02-02 10:28:20 UTC (rev 672)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CMakeGenerateManager.java 2017-02-02 10:29:27 UTC (rev 673)
@@ -141,10 +141,6 @@
result.add(gr);
//TODO アイコン、ビットマップのコピー
-// //cmake/Modules
-// gr = generateModulesFindOpenRTM(contextMap);
-// result.add(gr);
-
//doc
gr = generateDocCMakeLists(contextMap);
result.add(gr);
@@ -261,14 +257,6 @@
return generate(infile, outfile, contextMap);
}
- // 1.0系 (CMake/cmake/Modules)
- public GeneratedResult generateModulesFindOpenRTM(
- Map<String, Object> contextMap) {
- String outfile = "cmake/Modules/FindOpenRTM.cmake";
- String infile = "cmake/cmake/FindOpenRTM.cmake.vsl";
- return generate(infile, outfile, contextMap);
- }
-
// 1.0系 (CMake/doc)
public GeneratedResult generateDocCMakeLists(Map<String, Object> contextMap) {
String outfile = "doc/CMakeLists.txt";
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl 2017-02-02 10:28:20 UTC (rev 672)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl 2017-02-02 10:29:27 UTC (rev 673)
@@ -48,14 +48,7 @@
"components/share/${dol}{PROJECT_NAME_LOWER}-${dol}{PROJECT_VERSION_MAJOR}")
${sharp} Get necessary dependency information
-find_package(OpenRTM HINTS /usr/lib64/openrtm-1.1/cmake)
-if(${dol}{OpenRTM_FOUND})
- MESSAGE(STATUS "OpenRTM configuration Found")
-else(${dol}{OpenRTM_FOUND})
- message(STATUS "Use cmake/Modules/FindOpenRTM.cmake in the project")
- list(APPEND CMAKE_MODULE_PATH ${dol}{PROJECT_SOURCE_DIR}/cmake/Modules)
- find_package(OpenRTM REQUIRED)
-endif(${dol}{OpenRTM_FOUND})
+find_package(OpenRTM)
${sharp} Universal settings
${sharp}enable_testing()
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/FindOpenRTM.cmake.vsl
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/FindOpenRTM.cmake.vsl 2017-02-02 10:28:20 UTC (rev 672)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/FindOpenRTM.cmake.vsl 2017-02-02 10:29:27 UTC (rev 673)
@@ -1,311 +0,0 @@
-
-set(OMNIORB_FOUND FALSE)
-set(OPENRTM_FOUND FALSE)
-
-
-if(UNIX)
- include(FindPkgConfig)
-
- ${sharp} omniORB
- pkg_check_modules(OMNIORB REQUIRED "omniORB4")
- if(NOT OMNIORB_DIR)
- if(OMNIORB_FOUND)
- set(OMNIORB_DIR "${dol}{OMNIORB_PREFIX}")
- endif()
- set(OMNIORB_DIR "${dol}{OMNIORB_DIR}" CACHE PATH "omniORB root directory")
- endif()
-
- set(OMNIORB_CFLAGS ${dol}{OMNIORB_CFLAGS_OTHER})
- set(OMNIORB_LDFLAGS ${dol}{OMNIORB_LDFLAGS_OTHER})
-
- ${sharp} OpenRTM-aist
- pkg_check_modules(OPENRTM REQUIRED "openrtm-aist")
- if(NOT OPENRTM_DIR)
- if(OPENRTM_FOUND)
- set(OPENRTM_DIR "${dol}{OPENRTM_PREFIX}")
- endif()
- set(OPENRTM_DIR "${dol}{OPENRTM_DIR}" CACHE PATH "OpenRTM-aist root directory")
- endif()
-
- set(OPENRTM_CFLAGS ${dol}{OPENRTM_CFLAGS_OTHER})
- set(OPENRTM_LDFLAGS ${dol}{OPENRTM_LDFLAGS_OTHER})
-
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1"
- OPENRTM_VERSION_MAJOR "${dol}{OPENRTM_VERSION}")
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2"
- OPENRTM_VERSION_MINOR "${dol}{OPENRTM_VERSION}")
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\3"
- OPENRTM_VERSION_PATCH "${dol}{OPENRTM_VERSION}")
-
- ${sharp} IDL Compiler
- set(OPENRTM_IDLC "")
- set(OPENRTM_IDLFLAGS "")
-
- execute_process(COMMAND rtm-config --idlc
- RESULT_VARIABLE result_val
- OUTPUT_VARIABLE output_val
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- if(result_val EQUAL 0)
- set(OPENRTM_IDLC "${dol}{output_val}")
- endif()
-
- execute_process(COMMAND rtm-config --idlflags
- RESULT_VARIABLE result_val
- OUTPUT_VARIABLE output_val
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- if(result_val EQUAL 0)
- string(REPLACE " " ";" output_val ${dol}{output_val})
- set(OPENRTM_IDLFLAGS ${dol}{output_val} "-I${dol}{OPENRTM_DIR}/include/rtm/idl")
- endif()
-
- ${sharp} IDL Skelton Wrapper
- set(OPENRTM_IDL_WRAPPER "rtm-skelwrapper")
- set(OPENRTM_IDL_WRAPPER_FLAGS --include-dir="" --skel-suffix=Skel --stub-suffix=Stub)
-
-endif(UNIX)
-
-set(WIN32_RTM "")
-set(RTM_CONFIG_CMAKE "")
-
-macro(rtm_norm_path _path _result)
- string(REGEX REPLACE "\"" "" _var "${dol}{_path}")
- string(REGEX REPLACE "[/]+" "/" _var "${dol}{_var}")
- string(REGEX REPLACE "[/]${dol}" "" _var "${dol}{_var}")
- set(${dol}{_result} "${dol}{_var}")
-endmacro(rtm_norm_path)
-
-if(WIN32)
- set(WIN32_RTM "10")
- find_file(rtm_conf "rtm_config.cmake" PATHS "${dol}ENV{RTM_ROOT}/etc")
- if(rtm_conf)
- set(WIN32_RTM "11")
- set(RTM_CONFIG_CMAKE "${dol}{rtm_conf}")
- endif()
-endif(WIN32)
-
-if(WIN32_RTM STREQUAL "11")
- include("${dol}{RTM_CONFIG_CMAKE}")
- message(STATUS "Configuration by ${dol}{RTM_CONFIG_CMAKE}.")
-
- ${sharp} omniORB
- set(OMNIORB_DIR "${dol}{omni_root}")
- set(OMNIORB_FOUND TRUE)
- file(TO_CMAKE_PATH "${dol}{OMNIORB_DIR}" OMNIORB_DIR)
-
- foreach(path ${dol}{omni_includes})
- file(TO_CMAKE_PATH "${dol}{path}" path)
- rtm_norm_path("${dol}{path}" path)
- list(APPEND OMNIORB_INCLUDE_DIRS "${dol}{path}")
- endforeach()
- foreach(path ${dol}{omni_libdir})
- file(TO_CMAKE_PATH "${dol}{path}" path)
- rtm_norm_path("${dol}{path}" path)
- list(APPEND OMNIORB_LIBRARY_DIRS "${dol}{path}")
- endforeach()
-
- ${sharp} omniORB version
- file(GLOB _vers RELATIVE "${dol}{OMNIORB_DIR}" "${dol}{OMNIORB_DIR}/THIS_IS_OMNIORB*")
- if("${dol}{_vers}" STREQUAL "")
- message(FATAL_ERROR "omniORB version file not found.")
- endif()
-
- set(OMNIORB_VERSION "${dol}{_vers}")
- string(REGEX REPLACE "THIS_IS_OMNIORB_" ""
- OMNIORB_VERSION "${dol}{OMNIORB_VERSION}")
- string(REGEX REPLACE "[_]" "."
- OMNIORB_VERSION "${dol}{OMNIORB_VERSION}")
-
- set(OMNIORB_VERSION_NUM "${dol}{omni_dllver}")
- set(OMNIORB_THREAD_NUM "${dol}{omnithread_dllver}")
-
- set(OMNIORB_CFLAGS -D__WIN32__;-D__x86__;-D__NT__;-D__OSVERSION__=4;-D_CRT_SECURE_NO_DEPRECATE)
- if(${dol}{OMNIORB_VERSION_NUM} MATCHES "^40")
- set(OMNIORB_CFLAGS ${dol}{OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0400)
- else()
- set(OMNIORB_CFLAGS ${dol}{OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0500;-DRTC_CORBA_CXXMAPPING11)
- endif()
-
- foreach(library ${dol}{omni_lib})
- list(APPEND OMNIORB_LIBRARIES optimized "${dol}{library}")
- endforeach()
- foreach(library ${dol}{omni_libd})
- list(APPEND OMNIORB_LIBRARIES debug "${dol}{library}")
- endforeach()
-
- ${sharp} OpenRTM-aist
- set(OPENRTM_DIR "${dol}{rtm_root}")
- set(OPENRTM_FOUND TRUE)
- file(TO_CMAKE_PATH "${dol}{OPENRTM_DIR}" OPENRTM_DIR)
-
- ${sharp} OpenRTM-aist version
- set(OPENRTM_VERSION "${dol}{rtm_version}")
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1"
- OPENRTM_VERSION_MAJOR "${dol}{OPENRTM_VERSION}")
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2"
- OPENRTM_VERSION_MINOR "${dol}{OPENRTM_VERSION}")
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\3"
- OPENRTM_VERSION_PATCH "${dol}{OPENRTM_VERSION}")
-
- set(OPENRTM_VERSION_NUM "${dol}{rtm_dllver}")
-
- foreach(path ${dol}{rtm_includes})
- file(TO_CMAKE_PATH "${dol}{path}" path)
- rtm_norm_path("${dol}{path}" path)
- list(APPEND OPENRTM_INCLUDE_DIRS "${dol}{path}")
- endforeach()
- foreach(path ${dol}{rtm_libdir})
- file(TO_CMAKE_PATH "${dol}{path}" path)
- rtm_norm_path("${dol}{path}" path)
- list(APPEND OPENRTM_LIBRARY_DIRS "${dol}{path}")
- endforeach()
-
- set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
-
- foreach(library ${dol}{rtm_lib})
- list(APPEND OPENRTM_LIBRARIES optimized "${dol}{library}")
- endforeach()
- foreach(library ${dol}{coil_lib})
- list(APPEND OPENRTM_LIBRARIES optimized "${dol}{library}")
- endforeach()
-
- foreach(library ${dol}{rtm_libd})
- list(APPEND OPENRTM_LIBRARIES debug "${dol}{library}")
- endforeach()
- foreach(library ${dol}{coil_libd})
- list(APPEND OPENRTM_LIBRARIES debug "${dol}{library}")
- endforeach()
-
- ${sharp} IDL Compiler
- set(OPENRTM_IDLC "${dol}{rtm_idlc}")
- foreach(flag ${dol}{rtm_idlflags})
- string(REGEX REPLACE "[\\]" "/" flag "${flag}")
- list(APPEND OPENRTM_IDLFLAGS "${dol}{flag}")
- endforeach()
-
- ${sharp} IDL Skelton Wrapper
- set(OPENRTM_IDL_WRAPPER "rtm-skelwrapper.py")
- set(OPENRTM_IDL_WRAPPER_FLAGS --include-dir="" --skel-suffix=Skel --stub-suffix=Stub)
-
-endif(WIN32_RTM STREQUAL "11")
-
-if(WIN32_RTM STREQUAL "10")
- ${sharp} omniORB
- if(NOT OMNIORB_DIR)
- if(NOT ${dol}ENV{OMNI_ROOT} STREQUAL "")
- set(OMNIORB_DIR "${dol}ENV{OMNI_ROOT}")
- set(OMNIORB_FOUND TRUE)
- endif()
- set(OMNIORB_DIR "${dol}{OMNIORB_DIR}" CACHE PATH "omniORB root directory")
- if(NOT OMNIORB_FOUND)
- message(FATAL_ERROR "omniORB not found.")
- endif()
- endif()
-
- set(OMNIORB_INCLUDE_DIRS "${dol}{OMNIORB_DIR}/include")
- set(OMNIORB_LIBRARY_DIRS "${dol}{OMNIORB_DIR}/lib/x86_win32")
-
- ${sharp} omniORB version
- file(GLOB _vers RELATIVE "${dol}{OMNIORB_DIR}" "${dol}{OMNIORB_DIR}/THIS_IS_OMNIORB*")
- if("${dol}{_vers}" STREQUAL "")
- message(FATAL_ERROR "omniORB version file not found.")
- endif()
-
- set(OMNIORB_VERSION "${dol}{_vers}")
- string(REGEX REPLACE "THIS_IS_OMNIORB_" ""
- OMNIORB_VERSION "${dol}{OMNIORB_VERSION}")
- string(REGEX REPLACE "[_]" "."
- OMNIORB_VERSION "${dol}{OMNIORB_VERSION}")
- string(REGEX REPLACE "[.]" ""
- OMNIORB_VERSION_NUM "${dol}{OMNIORB_VERSION}")
-
- ${sharp} omnithread version
- file(GLOB _vers RELATIVE "${dol}{OMNIORB_LIBRARY_DIRS}" "${dol}{OMNIORB_LIBRARY_DIRS}/omnithread*")
- if("${dol}{_vers}" STREQUAL "")
- message(FATAL_ERROR "omnithread not found.")
- endif()
- string(REGEX REPLACE ".*omnithread([0-9]+)_rt\\.lib.*" "\\1"
- OMNIORB_THREAD_NUM "${dol}{_vers}")
-
- set(OMNIORB_CFLAGS -D__WIN32__;-D__x86__;-D__NT__;-D__OSVERSION__=4;-D_CRT_SECURE_NO_DEPRECATE)
- if(${dol}{OMNIORB_VERSION_NUM} MATCHES "^40")
- set(OMNIORB_CFLAGS ${dol}{OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0400)
- else()
- set(OMNIORB_CFLAGS ${dol}{OMNIORB_CFLAGS};-D_WIN32_WINNT=0x0500;-DRTC_CORBA_CXXMAPPING11)
- endif()
-
- foreach(library "omniORB${dol}{OMNIORB_VERSION_NUM}_rt"
- "omniDynamic${dol}{OMNIORB_VERSION_NUM}_rt"
- "omnithread${dol}{OMNIORB_THREAD_NUM}_rt")
- list(APPEND OMNIORB_LIBRARIES optimized "${dol}{library}" debug "${dol}{library}d")
- endforeach()
-
- ${sharp} OpenRTM-aist
- if(NOT OPENRTM_DIR)
- if(NOT ${dol}ENV{RTM_ROOT} STREQUAL "")
- set(OPENRTM_DIR "${dol}ENV{RTM_ROOT}")
- set(OPENRTM_FOUND TRUE)
- endif()
- set(OPENRTM_DIR "${dol}{OPENRTM_DIR}" CACHE PATH "OpenRTM-aist root directory")
- if(NOT OPENRTM_FOUND)
- message(FATAL_ERROR "OpenRTM-aist not found.")
- endif()
- endif()
-
- ${sharp} OpenRTM-aist version
- set(OPENRTM_VERSION "${dol}{OPENRTM_DIR}")
- string(REGEX REPLACE ".*OpenRTM-aist/" "" OPENRTM_VERSION "${dol}{OPENRTM_VERSION}")
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\1" OPENRTM_VERSION_MAJOR "${dol}{OPENRTM_VERSION}")
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\2" OPENRTM_VERSION_MINOR "${dol}{OPENRTM_VERSION}")
- set(OPENRTM_VERSION_PATCH "0")
- set(OPENRTM_VERSION "${dol}{OPENRTM_VERSION_MAJOR}.${dol}{OPENRTM_VERSION_MINOR}.${dol}{OPENRTM_VERSION_PATCH}")
- string(REGEX REPLACE "[.]" ""
- OPENRTM_VERSION_NUM "${dol}{OPENRTM_VERSION}")
-
- set(OPENRTM_INCLUDE_DIRS "${dol}{OPENRTM_DIR}")
- set(OPENRTM_LIBRARY_DIRS "${dol}{OPENRTM_DIR}/bin")
- list(APPEND OPENRTM_INCLUDE_DIRS "${dol}{OPENRTM_DIR}/rtm/idl")
-
- set(OPENRTM_CFLAGS "-DUSE_stub_in_nt_dll")
-
- foreach(library "RTC${dol}{OPENRTM_VERSION_NUM}" "coil")
- list(APPEND OPENRTM_LIBRARIES optimized "${dol}{library}" debug "${dol}{library}d")
- endforeach()
- foreach(library "ws2_32" "mswsock")
- list(APPEND OPENRTM_LIBRARIES optimized "${dol}{library}" debug "${dol}{library}")
- endforeach()
-
- ${sharp} IDL Compiler
- set(OPENRTM_IDLC "omniidl")
- set(OPENRTM_IDLFLAGS -bcxx -Wba -nf)
-
- ${sharp} IDL Skelton Wrapper
- set(OPENRTM_IDL_WRAPPER "rtm-skelwrapper.py")
- set(OPENRTM_IDL_WRAPPER_FLAGS --include-dir="" --skel-suffix=Skel --stub-suffix=Stub)
-
-endif(WIN32_RTM STREQUAL "10")
-
-message(STATUS "FindOpenRTM setup done.")
-
-message(STATUS " OMNIORB_DIR=${dol}{OMNIORB_DIR}")
-message(STATUS " OMNIORB_VERSION=${dol}{OMNIORB_VERSION}")
-message(STATUS " OMNIORB_CFLAGS=${dol}{OMNIORB_CFLAGS}")
-message(STATUS " OMNIORB_INCLUDE_DIRS=${dol}{OMNIORB_INCLUDE_DIRS}")
-message(STATUS " OMNIORB_LDFLAGS=${dol}{OMNIORB_LDFLAGS}")
-message(STATUS " OMNIORB_LIBRARY_DIRS=${dol}{OMNIORB_LIBRARY_DIRS}")
-message(STATUS " OMNIORB_LIBRARIES=${dol}{OMNIORB_LIBRARIES}")
-
-message(STATUS " OPENRTM_DIR=${dol}{OPENRTM_DIR}")
-message(STATUS " OPENRTM_VERSION=${dol}{OPENRTM_VERSION}")
-message(STATUS " OPENRTM_VERSION_MAJOR=${dol}{OPENRTM_VERSION_MAJOR}")
-message(STATUS " OPENRTM_VERSION_MINOR=${dol}{OPENRTM_VERSION_MINOR}")
-message(STATUS " OPENRTM_VERSION_PATCH=${dol}{OPENRTM_VERSION_PATCH}")
-message(STATUS " OPENRTM_CFLAGS=${dol}{OPENRTM_CFLAGS}")
-message(STATUS " OPENRTM_INCLUDE_DIRS=${dol}{OPENRTM_INCLUDE_DIRS}")
-message(STATUS " OPENRTM_LDFLAGS=${dol}{OPENRTM_LDFLAGS}")
-message(STATUS " OPENRTM_LIBRARY_DIRS=${dol}{OPENRTM_LIBRARY_DIRS}")
-message(STATUS " OPENRTM_LIBRARIES=${dol}{OPENRTM_LIBRARIES}")
-
-message(STATUS " OPENRTM_IDLC=${dol}{OPENRTM_IDLC}")
-message(STATUS " OPENRTM_IDLFLAGS=${dol}{OPENRTM_IDLFLAGS}")
-message(STATUS " OPENRTM_IDL_WRAPPER=${dol}{OPENRTM_IDL_WRAPPER}")
-message(STATUS " OPENRTM_IDL_WRAPPER_FLAGS=${dol}{OPENRTM_IDL_WRAPPER_FLAGS}")
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/FindOpenRTM.cmake.vsl
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/FindOpenRTM.cmake.vsl 2017-02-02 10:28:20 UTC (rev 672)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/FindOpenRTM.cmake.vsl 2017-02-02 10:29:27 UTC (rev 673)
@@ -1,134 +0,0 @@
-${sharp} Find OpenRTM-aist
-${sharp}
-${sharp} The following additional directories are searched:
-${sharp} OPENRTM_ROOT (CMake variable)
-${sharp} OPENRTM_ROOT (Environment variable)
-${sharp}
-${sharp} This sets the following variables:
-${sharp} OPENRTM_FOUND - True if OpenRTM-aist was found.
-${sharp} OPENRTM_INCLUDE_DIRS - Directories containing the OpenRTM-aist include files.
-${sharp} OPENRTM_LIBRARIES - Libraries needed to use OpenRTM-aist.
-${sharp} OPENRTM_CFLAGS - Compiler flags for OpenRTM-aist.
-${sharp} OPENRTM_VERSION - The version of OpenRTM-aist found.
-${sharp} OPENRTM_VERSION_MAJOR - The major version of OpenRTM-aist found.
-${sharp} OPENRTM_VERSION_MINOR - The minor version of OpenRTM-aist found.
-${sharp} OPENRTM_VERSION_REVISION - The revision version of OpenRTM-aist found.
-${sharp} OPENRTM_VERSION_CANDIDATE - The candidate version of OpenRTM-aist found.
-${sharp} OPENRTM_IDL_COMPILER - The IDL compiler used by OpenRTM-aist.
-${sharp} OPENRTM_IDL_FLAGS - The flags used to compile OpenRTM-aist IDL files.
-${sharp} OPENRTM_IDL_DIR - The directory containing the OpenRTM-aist IDL files.
-${sharp}
-${sharp} This module also defines one macro usable in your CMakeLists.txt files:
-${sharp} OPENRTM_COMPILE_IDL_FILES(file1 file2 ...)
-${sharp} Compiles the specified IDL files, placing the generated C++ source files in
-${sharp} ${dol}{CMAKE_CURRENT_BINARY_DIR}. The source files can be found in file1_SRCS,
-${sharp} file2_SRCS, etc., and all source files for all IDL files are available in
-${sharp} ALL_IDL_SRCS. To depend on the generated files, depend on the targets
-${sharp} file1_TGT, file2_TGT, etc. The target ALL_IDL_TGT is available to depend on
-${sharp} all source files generated from IDL files.
-
-find_package(PkgConfig)
-pkg_check_modules(PC_OPENRTM openrtm-aist)
-pkg_check_modules(PC_COIL libcoil)
-pkg_check_modules(PC_OMNIORB4 omniORB4)
-pkg_check_modules(PC_OMNITHREAD3 omnithread3)
-pkg_check_modules(PC_OMNIDYNAMIC4 omniDynamic4)
-if ("${dol}{CMAKE_SYSTEM_NAME}" MATCHES "Linux")
- pkg_check_modules(PC_UUID uuid)
-endif ("${dol}{CMAKE_SYSTEM_NAME}" MATCHES "Linux")
-
-find_path(OPENRTM_INCLUDE_DIR rtm/RTC.h
- HINTS ${dol}{OPENRTM_ROOT}/include ${dol}{OPENRTM_ROOT} ${dol}ENV{OPENRTM_ROOT}/include ${dol}{PC_OPENRTM_INCLUDE_DIRS})
-
-find_path(COIL_INCLUDE_DIR coil/config_coil.h
- HINTS ${dol}{OPENRTM_ROOT}/include ${dol}ENV{OPENRTM_ROOT}/include ${dol}{PC_COIL_INCLUDE_DIRS})
-
-find_path(OMNIORB4_INCLUDE_DIR omniORB4/omniORB.h
- HITS ${dol}{OMNI_ROOT}/include ${dol}{PC_OMNIORB4_INCLUDE_DIRS})
-
-find_library(OPENRTM_LIBRARY RTC
- HINTS ${dol}{OPENRTM_ROOT}/lib ${dol}ENV{OPENRTM_ROOT}/lib
- ${dol}{PC_OPENRTM_LIBRARY_DIRS})
-find_library(COIL_LIBRARY coil
- HINTS ${dol}{OPENRTM_ROOT}/lib ${dol}ENV{OPENRTM_ROOT}/lib
- ${dol}{PC_COIL_LIBRARY_DIRS})
-find_library(OMNIORB4_LIBRARY omniORB4
- HINTS ${dol}{PC_OMNIORB4_LIBRARY_DIRS})
-find_library(OMNITHREAD3_LIBRARY omnithread
- HINTS ${dol}{PC_OMNITHREAD3_LIBRARY_DIRS})
-find_library(OMNIDYNAMIC4_LIBRARY omniDynamic4
- HINTS ${dol}{PC_OMNIDYNAMIC4_LIBRARY_DIRS})
-if ("${dol}{CMAKE_SYSTEM_NAME}" MATCHES "Linux")
- find_library(UUID_LIBRARY uuid
- HINTS ${dol}{PC_UUID_LIBRARY_DIRS})
-else ("${dol}{CMAKE_SYSTEM_NAME}" MATCHES "Linux")
- set(UUID_LIBRARY "")
-endif ("${dol}{CMAKE_SYSTEM_NAME}" MATCHES "Linux")
-
-set(OPENRTM_CFLAGS ${dol}{PC_OPENRTM_CFLAGS_OTHER} ${dol}{PC_COIL_CFLAGS_OTHER} ${dol}{PC_OMNIORB4_CFLAGS_OTHER})
-set(OPENRTM_INCLUDE_DIRS ${dol}{OPENRTM_INCLUDE_DIR} ${dol}{OPENRTM_INCLUDE_DIR}/rtm/idl
- ${dol}{COIL_INCLUDE_DIR} ${dol}{OMNIORB4_INCLUDE_DIR})
-set(OPENRTM_LIBRARIES ${dol}{OPENRTM_LIBRARY} ${dol}{COIL_LIBRARY} ${dol}{OMNIORB4_LIBRARY} ${dol}{OMNITHREAD3_LIBRARY} ${dol}{OMNIDYNAMIC4_LIBRARY} ${dol}{UUID_LIBRARY} dl pthread)
-
-file(STRINGS ${dol}{OPENRTM_INCLUDE_DIR}/rtm/version.h OPENRTM_VERSION
- NEWLINE_CONSUME)
-${sharp}set(OPENRTM_VERSION "1.1.0")
-string(REGEX MATCH "version = \"([0-9]+)\\.([0-9]+)\\.([0-9]+)-?([a-zA-Z0-9]*)\""
- OPENRTM_VERSION "${dol}{OPENRTM_VERSION}")
-set(OPENRTM_VERSION_MAJOR ${dol}{CMAKE_MATCH_1})
-set(OPENRTM_VERSION_MINOR ${dol}{CMAKE_MATCH_2})
-set(OPENRTM_VERSION_REVISION ${dol}{CMAKE_MATCH_3})
-set(OPENRTM_VERSION_CANDIDATE ${dol}{CMAKE_MATCH_4})
-
-execute_process(COMMAND rtm-config --libs-only-l OUTPUT_VARIABLE
- OPENRTM_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND rtm-config --libs-only-L OUTPUT_VARIABLE
- OPENRTM_LIBRARY_DIRS OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND rtm-config --idlc OUTPUT_VARIABLE OPENRTM_IDL_COMPILER
- OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND rtm-config --idlflags OUTPUT_VARIABLE OPENRTM_IDL_FLAGS
- OUTPUT_STRIP_TRAILING_WHITESPACE)
-separate_arguments(OPENRTM_IDL_FLAGS)
-execute_process(COMMAND rtm-config --prefix OUTPUT_VARIABLE _rtm_prefix
- OUTPUT_STRIP_TRAILING_WHITESPACE)
-set(OPENRTM_IDL_DIR
- ${dol}{_rtm_prefix}/include/openrtm-${dol}{OPENRTM_VERSION_MAJOR}.${dol}{OPENRTM_VERSION_MINOR}/rtm/idl
- CACHE STRING "Directory containing the OpenRTM-aist IDL files.")
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(OpenRTM
- REQUIRED_VARS OPENRTM_INCLUDE_DIR COIL_INCLUDE_DIR OPENRTM_LIBRARY
- COIL_LIBRARY OPENRTM_IDL_COMPILER)
-
-macro(_IDL_OUTPUTS _idl _dir _result)
- set(${dol}{_result} ${dol}{_dir}/${dol}{_idl}SK.cc ${dol}{_dir}/${dol}{_idl}.hh
- ${dol}{_dir}/${dol}{_idl}DynSK.cc)
-endmacro(_IDL_OUTPUTS)
-
-
-macro(_COMPILE_IDL _idl_file)
- get_filename_component(_idl ${dol}{_idl_file} NAME_WE)
- set(_idl_srcs_var ${dol}{_idl}_SRCS)
- _IDL_OUTPUTS(${dol}{_idl} ${dol}{CMAKE_CURRENT_BINARY_DIR} ${dol}{_idl_srcs_var})
-
- add_custom_command(OUTPUT ${dol}{${dol}{_idl_srcs_var}}
- COMMAND ${dol}{OPENRTM_IDL_COMPILER} ${dol}{OPENRTM_IDL_FLAGS}
- -I${dol}{OPENRTM_IDL_DIR} ${dol}{_idl_file}
- WORKING_DIRECTORY ${dol}{CURRENT_BINARY_DIR}
- DEPENDS ${dol}{_idl_file}
- COMMENT "Compiling ${dol}{_idl_file}" VERBATIM)
- add_custom_target(${dol}{_idl}_TGT DEPENDS ${dol}{${dol}{_idl_srcs_var}})
- set(ALL_IDL_SRCS ${dol}{ALL_IDL_SRCS} ${dol}{${dol}{_idl_srcs_var}})
- if(NOT TARGET ALL_IDL_TGT)
- add_custom_target(ALL_IDL_TGT)
- endif(NOT TARGET ALL_IDL_TGT)
- add_dependencies(ALL_IDL_TGT ${dol}{_idl}_TGT)
-endmacro(_COMPILE_IDL)
-
-${sharp} Module exposed to the user
-macro(OPENRTM_COMPILE_IDL_FILES)
- foreach(idl ${dol}{ARGN})
- _COMPILE_IDL(${dol}{idl})
- endforeach(idl)
-endmacro(OPENRTM_COMPILE_IDL_FILES)
-
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/BasicEditorFormPage.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/BasicEditorFormPage.java 2017-02-02 10:28:20 UTC (rev 672)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/BasicEditorFormPage.java 2017-02-02 10:29:27 UTC (rev 673)
@@ -2,6 +2,10 @@
import java.io.ByteArrayInputStream;
import java.io.File;
+import java.io.IOException;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.GregorianCalendar;
@@ -14,6 +18,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectDescription;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
@@ -682,6 +687,24 @@
}// 通常のExceptionは外側でcatchする
handler.storeToXML(selectedFileName, editor.getGeneratorParam());
}
+ //FSM
+ PropertyParam fsm = editor.getRtcParam().getProperty(IRtcBuilderConstants.PROP_TYPE_FSM);
+ if(fsm!=null) {
+ if(Boolean.valueOf(fsm.getValue())) {
+ String cmpName = editor.getRtcParam().getName() + "FSM.scxml";
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ IWorkspaceRoot root = workspace.getRoot();
+ IProject project = root.getProject(editor.getRtcParam().getOutputProject());
+ String fsmFile = project.getFile(cmpName).getLocation().toOSString();
+ if(fsmFile!=null) {
+ String dirName = new File(selectedFileName).getParent();
+ String targetFile = dirName + File.separator + cmpName;
+ Path inputPath = FileSystems.getDefault().getPath(fsmFile);
+ Path outputPath = FileSystems.getDefault().getPath(targetFile);
+ Files.copy(inputPath, outputPath);
+ }
+ }
+ }
export.postExport(selectedFileName, editor);
editor.getRtcParam().resetUpdated();
editor.updateDirty();
@@ -748,6 +771,40 @@
return;
}
}
+ //FSM
+ PropertyParam fsm = editor.getRtcParam().getProperty(IRtcBuilderConstants.PROP_TYPE_FSM);
+ if(fsm!=null) {
+ if(Boolean.valueOf(fsm.getValue())) {
+ FileDialog dialogFSM = new FileDialog(getSite().getShell(),SWT.OPEN);
+ dialogFSM.setText("FSM Import");
+
+ //TODO 多言語化
+ String[] namesFSM = new String[] { "SCXMLファイル", "XMLファイル" };
+ String[] extsFSM = new String[] { "*.scxml","*.xml" };
+ dialogFSM.setFilterNames(namesFSM);
+ dialogFSM.setFilterExtensions(extsFSM);
+ String selectedFileNameFSM = dialogFSM.open();
+ if(selectedFileNameFSM == null) {
+ fsm.setValue("false");
+ editor.getRtcParam().deleteFSMPort();
+
+ } else {
+ String cmpName = editor.getRtcParam().getName() + "FSM.scxml";
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ IWorkspaceRoot root = workspace.getRoot();
+ IProject project = root.getProject(editor.getRtcParam().getOutputProject());
+ String fsmFile = project.getLocation().toOSString() + File.separator + cmpName;
+ try {
+ Path inputPath = FileSystems.getDefault().getPath(selectedFileNameFSM);
+ Path outputPath = FileSystems.getDefault().getPath(fsmFile);
+ Files.copy(inputPath, outputPath);
+ } catch (IOException e1) {
+ e1.printStackTrace();
+ }
+ }
+ }
+ }
+
MessageDialog.openInformation(getSite().getShell(), "Finish", IMessageConstants.BASIC_IMPORT_DONE);
//
editor.allPagesReLoad();
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/FSMEditorFormPage.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/FSMEditorFormPage.java 2017-02-02 10:28:20 UTC (rev 672)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/FSMEditorFormPage.java 2017-02-02 10:29:27 UTC (rev 673)
@@ -4,15 +4,17 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
import jp.go.aist.rtm.rtcbuilder.fsm.ScXMLHandler;
import jp.go.aist.rtm.rtcbuilder.fsm.StateParam;
import jp.go.aist.rtm.rtcbuilder.generator.param.PropertyParam;
-import jp.go.aist.rtm.rtcbuilder.util.FileUtil;
+import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
import jp.go.aist.rtm.toolscommon.fsm.editor.SCXMLGraphEditor;
import jp.go.aist.rtm.toolscommon.fsm.editor.SCXMLNotifier;
@@ -20,7 +22,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.swt.SWT;
@@ -50,9 +52,7 @@
private Button editBtn;
private SCXMLReceiver observer;
- private SCXMLGraphEditor scxmlEditor;
//
-
/**
* コンストラクタ
*
@@ -159,7 +159,7 @@
observer = new SCXMLReceiver();
}
observer.setFsmName(cmpName);
- scxmlEditor = SCXMLGraphEditor.openEditor(null, observer, false);
+ SCXMLGraphEditor scxmlEditor = SCXMLGraphEditor.openEditor(null, observer, false);
// String contents = FileUtil.readFile(targetFile);
} catch (Exception e1) {
e1.printStackTrace();
@@ -193,7 +193,7 @@
observer = new SCXMLReceiver();
}
observer.setFsmName(fsmName);
- scxmlEditor = SCXMLGraphEditor.openEditor(targetFile, observer, false);
+ SCXMLGraphEditor scxmlEditor = SCXMLGraphEditor.openEditor(targetFile, observer, false);
// String contents = FileUtil.readFile(targetFile);
} catch (Exception e1) {
e1.printStackTrace();
@@ -226,12 +226,10 @@
if (newFile == null) return;
/////
String strPath = fsmFile.getLocation().toOSString();
- String contents;
try {
- contents = FileUtil.readFile(newFile);
- BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(strPath), "UTF-8"));
- writer.write(contents);
- writer.close();
+ Path inputPath = FileSystems.getDefault().getPath(newFile);
+ Path outputPath = FileSystems.getDefault().getPath(strPath);
+ Files.copy(inputPath, outputPath);
MessageDialog.openInformation(getSite().getShell(), "Save", "対象データをインポートしました");
} catch (IOException e1) {
MessageDialog.openWarning(getSite().getShell(), "Save", "対象データのインポートに失敗しました");
@@ -307,6 +305,7 @@
* データをロードする
*/
public void load() {
+ if(fsmBtn==null) return;
RtcParam rtcParam = editor.getRtcParam();
PropertyParam target = rtcParam.getProperty(IRtcBuilderConstants.PROP_TYPE_FSM);
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXManipTest.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXManipTest.java 2017-02-02 10:28:20 UTC (rev 672)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXManipTest.java 2017-02-02 10:29:27 UTC (rev 673)
@@ -84,14 +84,13 @@
srvports.add(service1);
rtcParam.getServicePorts().addAll(srvports);
- genParam.getRtcParams().add(rtcParam);
Generator generator = new Generator();
List<GeneratedResult> result = generator.generateTemplateCode(genParam);
String resourceDir = rootPath + "/resource/100/CXX/idltype/IDLType1/";
- assertEquals(58, result.size());
+ assertEquals(29, result.size());
checkCode(result, resourceDir, "ModuleNameComp.cpp");
checkCode(result, resourceDir, "ModuleName.h");
checkCode(result, resourceDir, "ModuleName.cpp");
More information about the openrtm-commit
mailing list