[openrtm-commit:02531] r705 - in branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder: icons src/jp/go/aist/rtm/rtcbuilder src/jp/go/aist/rtm/rtcbuilder/manager src/jp/go/aist/rtm/rtcbuilder/nl src/jp/go/aist/rtm/rtcbuilder/template/cmake src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake src/jp/go/aist/rtm/rtcbuilder/template/cmake/idl src/jp/go/aist/rtm/rtcbuilder/template/cmake/include src/jp/go/aist/rtm/rtcbuilder/template/cmake/src src/jp/go/aist/rtm/rtcbuilder/ui/editors test/jp/go/aist/rtm/rtcbuilder/_test test/jp/go/aist/rtm/rtcbuilder/_test/_100
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 3月 20日 (月) 17:17:37 JST
Author: ga
Date: 2017-03-20 17:17:37 +0900 (Mon, 20 Mar 2017)
New Revision: 705
Added:
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/icons/rt_middleware_banner.bmp
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/icons/rt_middleware_dlg.bmp
Removed:
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/wix.xsl.in.vsl
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/wix.xsl.in.vsl
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/manager/CMakeGenerateManager.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/nl/messages.properties
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/cmake/cpack_options_cmake.in.vsl
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/idl/IdlCMakeLists.txt.vsl
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/include/IncModuleCMakeLists.txt.vsl
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl
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/IMessageConstants.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/TestBase.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConfigSetTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConstraint.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXContentTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXExCxtTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLStructTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java
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/CXXMultiTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXSystemConfigTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java
Log:
Modified FSM Hints #3958
Added: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/icons/rt_middleware_banner.bmp
===================================================================
(Binary files differ)
Property changes on: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/icons/rt_middleware_banner.bmp
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/icons/rt_middleware_dlg.bmp
===================================================================
(Binary files differ)
Property changes on: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/icons/rt_middleware_dlg.bmp
___________________________________________________________________
Added: 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-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java 2017-03-20 08:17:37 UTC (rev 705)
@@ -605,7 +605,8 @@
//
//アイコン、ビットマップのコピー
copyFigure("icons/rt_middleware_logo.ico", project, "cmake/rt_middleware_logo.ico");
- copyFigure("icons/rt_middleware_logo.bmp", project, "cmake/rt_middleware_logo.bmp");
+ copyFigure("icons/rt_middleware_banner.bmp", project, "cmake/rt_middleware_banner.bmp");
+ copyFigure("icons/rt_middleware_dlg.bmp", project, "cmake/rt_middleware_dlg.bmp");
}
private void copyFigure(String source, IProject outputProject, String dist) {
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-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CMakeGenerateManager.java 2017-03-20 08:17:37 UTC (rev 705)
@@ -22,12 +22,6 @@
protected static final String MSG_ERROR_GENERATE_FILE = IRTCBMessageConstants.ERROR_CODE_GENERATION;
- protected static Map<RtcParam, String> WIX_PRODUCT_ID_MAP = null;
- protected static Map<RtcParam, String> WIX_UPGRADECODE_MAP = null;
-
- protected String WIX_PRODUCT_ID = null;
- protected String WIX_UPGRADECODE = null;
-
protected String DOXYGEN_FILE_PATTERNS;
public CMakeGenerateManager() {
@@ -52,8 +46,6 @@
return result;
}
- resetWIXUUID(rtcParam);
-
Map<String, Object> contextMap = createContextMap(rtcParam);
contextMap.put("tmpltHelper", new TemplateHelper());
@@ -72,37 +64,12 @@
return true;
}
- public void resetWIXUUID(RtcParam rtcParam) {
- if (WIX_PRODUCT_ID_MAP == null) {
- WIX_PRODUCT_ID_MAP = new HashMap<RtcParam, String>();
- }
- if (WIX_UPGRADECODE_MAP == null) {
- WIX_UPGRADECODE_MAP = new HashMap<RtcParam, String>();
- }
- if (WIX_PRODUCT_ID_MAP.get(rtcParam) == null
- || WIX_UPGRADECODE_MAP.get(rtcParam) == null) {
- if (!rtcParam.getIsTest()) {
- WIX_PRODUCT_ID_MAP.put(rtcParam, getUUID());
- WIX_UPGRADECODE_MAP.put(rtcParam, getUUID());
- } else {
- WIX_PRODUCT_ID_MAP.put(rtcParam,
- "D839647B-9EDA-4344-857D-FA5A102E5DE5");
- WIX_UPGRADECODE_MAP.put(rtcParam,
- "8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942");
- }
- }
- WIX_PRODUCT_ID = WIX_PRODUCT_ID_MAP.get(rtcParam);
- WIX_UPGRADECODE = WIX_UPGRADECODE_MAP.get(rtcParam);
- }
-
public Map<String, Object> createContextMap(RtcParam rtcParam) {
Map<String, Object> map = new HashMap<String, Object>();
map.put("template", TEMPLATE_PATH);
map.put("rtcParam", rtcParam);
map.put("helper", new TemplateHelper());
map.put("DOXYGEN_FILE_PATTERNS", DOXYGEN_FILE_PATTERNS);
- map.put("WIX_PRODUCT_ID", WIX_PRODUCT_ID);
- map.put("WIX_UPGRADECODE", WIX_UPGRADECODE);
return map;
}
@@ -137,8 +104,6 @@
result.add(gr);
gr = generateUtilIn(contextMap);
result.add(gr);
- gr = generateResourceWixXSL(contextMap);
- result.add(gr);
//doc
gr = generateDocCMakeLists(contextMap);
@@ -214,7 +179,6 @@
public GeneratedResult generateCmakeConfigVersion(Map<String, Object> contextMap) {
RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- //TODO 暫定処理
String outfile = "cmake/" + rtcParam.getName().toLowerCase() + "-config-version.cmake.in";
String infile = "cmake/cmake/config_version.cmake.in.vsl";
return generate(infile, outfile, contextMap);
@@ -222,7 +186,6 @@
public GeneratedResult generateCmakeConfig(Map<String, Object> contextMap) {
RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- //TODO 暫定処理
String outfile = "cmake/" + rtcParam.getName().toLowerCase() + "-config.cmake.in";
String infile = "cmake/cmake/config.cmake.in.vsl";
return generate(infile, outfile, contextMap);
@@ -230,7 +193,6 @@
public GeneratedResult generateCmakePcIn(Map<String, Object> contextMap) {
RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- //TODO 暫定処理
String outfile = "cmake/" + rtcParam.getName().toLowerCase() + ".pc.in";
String infile = "cmake/cmake/pc.in.vsl";
return generate(infile, outfile, contextMap);
@@ -250,12 +212,6 @@
return generate(infile, outfile, contextMap);
}
- public GeneratedResult generateResourceWixXSL(Map<String, Object> contextMap) {
- String outfile = "cmake/wix.xsl.in";
- String infile = "cmake/cmake/wix.xsl.in.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/nl/messages.properties
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/nl/messages.properties 2017-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/nl/messages.properties 2017-03-20 08:17:37 UTC (rev 705)
@@ -402,6 +402,40 @@
IMessageConstants.PROFILE_COMPARE_MESSAGE_P1=The following contents have been modified.
IMessageConstants.PROFILE_COMPARE_MESSAGE_P2=Are you sure you want to change it?
+IMessageConstants.FSM_HINT_DESC_P1=Click the checkbox if you create a FSM (Finite State Machine) type component.
+IMessageConstants.FSM_HINT_DESC_P2=FSM-Components have two types as follows.
+IMessageConstants.FSM_STATIC_HINT_DESC_P1=Static FSM component.
+IMessageConstants.FSM_STATIC_HINT_DESC_P2=This type defines FSM structure statically in the source code.
+IMessageConstants.FSM_STATIC_HINT_DESC_P3=After compilation (after execution in Python component),
+IMessageConstants.FSM_STATIC_HINT_DESC_P4=the FSM structure cannot be changed.
+IMessageConstants.FSM_STATIC_HINT_DESC_P5=If you need a compact and closed FSM component, please this type.
+IMessageConstants.FSM_DYNAMIC_HINT_DESC_P1=Dynamic FSM component.
+IMessageConstants.FSM_DYNAMIC_HINT_DESC_P2=This component can be changed the FSM structure.
+IMessageConstants.FSM_DYNAMIC_HINT_DESC_P3=This type realizes one-state as one-component (FSM participant), and its behavior
+IMessageConstants.FSM_DYNAMIC_HINT_DESC_P4=can be changed in runtime giving its structure including number of state
+IMessageConstants.FSM_DYNAMIC_HINT_DESC_P5=and its relation with transition event and condition. However, its size becomes bigger.
+IMessageConstants.FSM_SCXML_HINT_DESC=FSM structure is described with SXCML (State Chart XML, W3C standard).
+IMessageConstants.FSM_SCXML_NEW=New
+IMessageConstants.FSM_SCXML_NEW_DESC_P1=If you create a new FSM structure, push the New button
+IMessageConstants.FSM_SCXML_NEW_DESC_P2=and launch FSM GUI editor and create it.
+IMessageConstants.FSM_SCXML_NEW_DESC_P3=It will be stored in a SCXML, and it will be saved in source code folder.
+IMessageConstants.FSM_SCXML_EDIT=Edit
+IMessageConstants.FSM_SCXML_EDIT_DESC_P1=If you edit current FSM structure again,
+IMessageConstants.FSM_SCXML_EDIT_DESC_P2=please push the Edit button.
+IMessageConstants.FSM_SCXML_IMPORT=Import
+IMessageConstants.FSM_SCXML_IMPORT_DESC_P1=If you give an existing SCXML file, please push the Import button.
+IMessageConstants.FSM_SCXML_IMPORT_DESC_P2=Select the SCXML file from the file selection dialog.
+
+IMessageConstants.FSM_OVERWRITE=FSM definition exists. Do you overwrite?
+IMessageConstants.FSM_NO_EXIST=FSM definition cannot be found.
+IMessageConstants.FSM_IMPORT_OK=The import of target data SUCCEEDED.
+IMessageConstants.FSM_IMPORT_NG=The import of target data FAILED.
+IMessageConstants.FSM_NOT_SELECTED=FSM type is NOT selected.
+IMessageConstants.FSM_TYPE_INVALID=FSM type is INVALID.
+IMessageConstants.FSM_NO_SM=State Machine of the FSM component in NOT SET.
+IMessageConstants.FSM_STATE_DUPL1=State [
+IMessageConstants.FSM_STATE_DUPL2=] is duplicated.
+
IMessageConstants.CREATE_FILE_ERROR=Failed to create file.
IMessageConstants.FILETYPE_YAML=YAML format
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-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl 2017-03-20 08:17:37 UTC (rev 705)
@@ -1,4 +1,8 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
+cmake_policy(SET CMP0002 OLD)
+if(POLICY CMP0046)
+ cmake_policy(SET CMP0046 OLD)
+endif()
if(POLICY CMP0048)
cmake_policy(SET CMP0048 OLD)
endif()
@@ -13,9 +17,61 @@
set(PROJECT_AUTHOR "${rtcParam.vender}")
set(PROJECT_AUTHOR_SHORT "${rtcParam.vender}")
-set(PROJECT_MAINTAINER "Noriaki Ando <n-ando at aist.go.jp>")
-set(PROJECT_TYPE "c++/opencv-rtcs")
+set(PROJECT_MAINTAINER "unknown")
+set(PROJECT_TYPE "c++/${rtcParam.category}")
+function(get_dist ARG0)
+ if(NOT ${dol}{CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ set(${dol}{ARG0} ${dol}{CMAKE_SYSTEM_NAME} PARENT_SCOPE)
+ return()
+ endif()
+ foreach(dist Debian Ubuntu RedHat Fedora CentOS)
+ execute_process(
+ COMMAND grep ${dol}{dist} -s /etc/issue /etc/os-release /etc/redhat-release /etc/system-release
+ OUTPUT_VARIABLE dist_name
+ )
+ if(${dol}{dist_name} MATCHES ${dol}{dist})
+ set(${dol}{ARG0} ${dol}{dist} PARENT_SCOPE)
+ return()
+ endif()
+ endforeach()
+endfunction(get_dist)
+
+function(get_pkgmgr ARG0)
+ get_dist(DIST_NAME)
+ if(${dol}{DIST_NAME} MATCHES "Debian" OR
+ ${dol}{DIST_NAME} MATCHES "Ubuntu")
+ set(${dol}{ARG0} "DEB" PARENT_SCOPE)
+ return()
+ endif()
+ if(${dol}{DIST_NAME} MATCHES "RedHat" OR
+ ${dol}{DIST_NAME} MATCHES "Fedora" OR
+ ${dol}{DIST_NAME} MATCHES "CentOS")
+ set(${dol}{ARG0} "RPM" PARENT_SCOPE)
+ return()
+ endif()
+endfunction(get_pkgmgr)
+
+get_dist(DIST_NAME)
+MESSAGE(STATUS "Distribution is ${dol}{DIST_NAME}")
+
+get_pkgmgr(PKGMGR)
+if(PKGMGR AND NOT LINUX_PACKAGE_GENERATOR)
+ set(LINUX_PACKAGE_GENERATOR ${dol}{PKGMGR})
+ if(${dol}{PKGMGR} MATCHES "DEB")
+ execute_process(COMMAND dpkg --print-architecture
+ OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "Package manager is ${dol}{PKGMGR}. Arch is ${dol}{CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.")
+ endif()
+ if(${dol}{PKGMGR} MATCHES "RPM")
+ execute_process(COMMAND uname "-m"
+ OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "Package manager is ${dol}{PKGMGR}. Arch is ${dol}{CPACK_RPM_PACKAGE_ARCHITECTURE}.")
+ endif()
+endif()
+
${sharp} Add an "uninstall" target
CONFIGURE_FILE ("${dol}{PROJECT_SOURCE_DIR}/cmake/uninstall_target.cmake.in"
"${dol}{PROJECT_BINARY_DIR}/uninstall_target.cmake" IMMEDIATE @ONLY)
@@ -44,10 +100,11 @@
${sharp} Set up installation directories
if(WIN32)
- set(INSTALL_PREFIX "components/${dol}{PROJECT_TYPE}")
+ set(OPENRTM_SHARE_PREFIX "OpenRTM-aist/${dol}{PROJECT_VERSION}/components/${dol}{PROJECT_TYPE}")
+ set(INSTALL_PREFIX ${dol}{PROJECT_NAME})
else(WIN32)
set(OPENRTM_SHARE_PREFIX "share/openrtm-${dol}{PROJECT_VERSION_MAJOR}.${dol}{PROJECT_VERSION_MINOR}")
- set(INSTALL_PREFIX "${dol}{OPENRTM_SHARE_PREFIX}/components/${dol}{PROJECT_TYPE}")
+ set(INSTALL_PREFIX "${dol}{OPENRTM_SHARE_PREFIX}/components/${dol}{PROJECT_TYPE}/${dol}{PROJECT_NAME}")
endif(WIN32)
${sharp} Get necessary dependency information
@@ -93,8 +150,8 @@
SET(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
ENDIF()
include(InstallRequiredSystemLibraries)
-set(PROJECT_EXECUTABLES ${dol}{PROJECT_NAME_LOWER}Comp
- "${dol}{PROJECT_NAME_LOWER}Comp")
+set(PROJECT_EXECUTABLES ${dol}{PROJECT_NAME}Comp
+ "${dol}{PROJECT_NAME}Comp.exe")
set(cpack_options "${dol}{PROJECT_BINARY_DIR}/cpack_options.cmake")
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/cpack_options_cmake.in.vsl
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/cpack_options_cmake.in.vsl 2017-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/cpack_options_cmake.in.vsl 2017-03-20 08:17:37 UTC (rev 705)
@@ -1,11 +1,17 @@
set(CPACK_PACKAGE_NAME "@PROJECT_NAME@")
+set(CPACK_RPM_PACKAGE_NAME "@PROJECT_NAME@")
set(CPACK_PACKAGE_VERSION_MAJOR "@PROJECT_VERSION_MAJOR@")
set(CPACK_PACKAGE_VERSION_MINOR "@PROJECT_VERSION_MINOR@")
set(CPACK_PACKAGE_VERSION_PATCH "@PROJECT_VERSION_REVISION@")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_DESCRIPTION@")
set(CPACK_PACKAGE_VENDOR "@PROJECT_VENDOR@")
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
-set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION@")
+
+if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at _@PROJECT_VERSION at _@CPACK_DEBIAN_PACKAGE_ARCHITECTURE@")
+endif(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+if(CPACK_RPM_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME at -@PROJECT_VERSION at -@CPACK_RPM_PACKAGE_ARCHITECTURE@")
+endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
set(CPACK_COMPONENTS_ALL component)
@@ -50,45 +56,26 @@
endif(INSTALL_SOURCES)
IF (WIN32)
-
- ${sharp} Windows WiX package settings
-
- set(CPACK_WIX_XSL "@CMAKE_CURRENT_BINARY_DIR@/wix.xsl")
- set(CPACK_WIX_LANG "ja-jp")
+ set(CPACK_GENERATOR "WIX")
set(CPACK_RESOURCE_FILE_LICENSE
"@CMAKE_CURRENT_SOURCE_DIR@/cmake/License.rtf")
- configure_file(
- "@CMAKE_CURRENT_SOURCE_DIR@/cmake/wix.xsl.in"
- "@CMAKE_CURRENT_BINARY_DIR@/wix.xsl" @ONLY)
-
set(CPACK_PACKAGE_FILE_NAME
- "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION@")
+ "@PROJECT_NAME@@PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_REVISION at _${CPACK_SYSTEM_NAME}")
+ set(CPACK_PACKAGE_EXECUTABLES "@PROJECT_EXECUTABLES@")
+ set(CPACK_PACKAGE_NAME ${dol}{CPACK_PACKAGE_FILE_NAME})
+ ${sharp} Windows WiX package settings
+ if(${dol}{CPACK_GENERATOR} MATCHES "WIX")
+ set(CPACK_PACKAGE_INSTALL_DIRECTORY @OPENRTM_SHARE_PREFIX@)
+ set(CPACK_WIX_CULTURES "ja-jp")
+ set(CPACK_WIX_PRODUCT_ICON "@PROJECT_SOURCE_DIR@/cmake\\rt_middleware_logo.ico")
+ set(CPACK_WIX_UI_BANNER "@PROJECT_SOURCE_DIR@/cmake/rt_middleware_banner.bmp")
+ set(CPACK_WIX_UI_DIALOG "@PROJECT_SOURCE_DIR@/cmake/rt_middleware_dlg.bmp")
+ set(CPACK_WIX_PROPERTY_ARPURLINFOABOUT "http://www.openrtm.org")
+ set(CPACK_UNINSTALL_NAME @PROJECT_NAME@)
+ endif()
- ${sharp}
- ${sharp}
- ${sharp}
- set(CPACK_NSIS_MUI_ICON "@PROJECT_SOURCE_DIR@/cmake\\rt_middleware_logo.ico")
- set(CPACK_NSIS_MUI_UNIICON "@PROJECT_SOURCE_DIR@/cmake\\rt_middleware_logo.ico")
- set(CPACK_PACKAGE_ICON "@PROJECT_SOURCE_DIR@/cmake\\rt_middleware_logo.bmp")
- set(CPACK_NSIS_HELP_LINK "http://www.openrtm.org")
- set(CPACK_NSIS_URL_INFO_ABOUT "http://www.openrtm.org")
- set(CPACK_NSIS_MODIFY_PATH ON)
- set(CPACK_PACKAGE_EXECUTABLES @PROJECT_EXECUTABLES@)
- if(INSTALL_DOCUMENTATION)
- set(CPACK_NSIS_MENU_LINKS
- "@CMAKE_INSTALL_PREFIX@/share/doc/@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@/html/index.html"
- "Component documentation")
- endif(INSTALL_DOCUMENTATION)
- string(REPLACE "/@PROJECT_NAME@" "" install_prefix_root
- "@CMAKE_INSTALL_PREFIX@")
- file(TO_NATIVE_PATH "${dol}{install_prefix_root}" install_prefix_root)
- set(CPACK_NSIS_INSTALL_ROOT "${dol}{install_prefix_root}")
- set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS
- " Rename \"${dol}INSTDIR\\share\\@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@\\@PROJECT_NAME_LOWER at -config.cmake\" \"${dol}INSTDIR\\@PROJECT_NAME_LOWER at -config.cmake\"
- Rename \"${dol}INSTDIR\\share\\@PROJECT_NAME_LOWER at -@PROJECT_VERSION_MAJOR@\\@PROJECT_NAME_LOWER at -config-version.cmake\" \"${dol}INSTDIR\\@PROJECT_NAME_LOWER at -config-version.cmake\"")
- set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS
- " Delete \"${dol}INSTDIR\\@PROJECT_NAME_LOWER at -config.cmake\"
- Delete \"${dol}INSTDIR\\@PROJECT_NAME_LOWER at -config-version.cmake\"")
+ELSE(WIN32)
+ set(CPACK_GENERATOR @LINUX_PACKAGE_GENERATOR@)
+ set(CPACK_PACKAGE_CONTACT @PROJECT_MAINTAINER@)
ENDIF (WIN32)
-
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/wix.xsl.in.vsl
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/wix.xsl.in.vsl 2017-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/cmake/wix.xsl.in.vsl 2017-03-20 08:17:37 UTC (rev 705)
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:wix="http://schemas.microsoft.com/wix/2006/wi">
- <xsl:output indent="yes" method="xml"/>
-
- <xsl:template match="/wix:Wix">
- <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Product xmlns="http://schemas.microsoft.com/wix/2006/wi" Id="${WIX_PRODUCT_ID}" Name="@CPACK_PACKAGE_NAME@ @CPACK_PACKAGE_VERSION@" Language="1041" Codepage="932" Version="@CPACK_PACKAGE_VERSION@" Manufacturer="@CPACK_PACKAGE_VENDOR@" UpgradeCode="${WIX_UPGRADECODE}">
- <Package InstallerVersion="300" Compressed="yes" Languages='1041' SummaryCodepage='932' />
- <Media Id="1" Cabinet="@CPACK_PACKAGE_NAME at .cab" EmbedCab="yes" />
- <Directory Id="TARGETDIR" Name="SourceDir" >
- <Directory Id="ProgramFilesFolder" Name="PFILE" >
- <Directory Id="OPENRTM_DIR" Name="OpenRTM-aist" >
- <!-- <Directory Id="INSTALLLOCATION" Name="@OPENRTM_VERSION_MAJOR at .@OPENRTM_VERSION_MINOR@" /> -->
- <Directory Id="INSTALLLOCATION" Name="1.1" />
- </Directory>
- </Directory>
- </Directory>
-
- <Feature Id="APPLICATIONS" Title="@CPACK_COMPONENT_COMPONENT_DISPLAY_NAME@" Level="1" Description="@CPACK_COMPONENT_COMPONENT_DESCRIPTION@" >
- <!-- Start Ripping through the xml -->
- <!--
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\@RTC_NAME at .dll')]" />
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\@RTC_NAME at .lib')]" />
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\@RTC_NAME at Comp.exe')]" />
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\RTC.xml')]" />
- -->
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, translate('\bin\@CPACK_PACKAGE_NAME at .dll','ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz'))]" />
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, translate('\lib\@CPACK_PACKAGE_NAME at .lib','ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz'))]" />
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, translate('\bin\@CPACK_PACKAGE_NAME at Comp.exe','ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz'))]" />
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, 'RTC.xml')]" />
- </Feature>
-
- <Feature Id="DOCUMENTS" Title="@CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME@" Level="1" Absent="allow" Description="@CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION@" >
- <!-- Start Ripping through the xml -->
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\doc')]" />
- </Feature>
-
- <!-- <Feature Id="SOURCES" Title="@CPACK_COMPONENT_SOURCES_DISPLAY_NAME@" Level="1" Absent="allow" Description="@CPACK_COMPONENT_SOURCES_DESCRIPTION@" >-->
- <!-- Start Ripping through the xml -->
- <!-- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@CPACK_PACKAGE_INSTALL_DIRECTORY@\src')]" /> -->
- <!-- </Feature> -->
-
- <!--Tack on your specific wix options-->
- <UIRef Id="WixUI_FeatureTree" />
- <UIRef Id="WixUI_ErrorProgressText" />
- <!--
- <WixVariable Id="WixUILicenseRtf" Value="@CPACK_RESOURCE_FILE_LICENSE@"/>
- -->
- <!-- TODO: Add Wix Specific Dialogs and features. -->
- <!-- TODO: Add artwork -->
- <!-- TODO: Add ... -->
-
- </Product>
-
- <!--Output the fragment info which heat generates-->
- <xsl:copy-of select="wix:Fragment[wix:DirectoryRef/wix:Component]" />
- <xsl:apply-templates select="wix:Fragment[wix:DirectoryRef/@Id!='TARGETDIR' and wix:DirectoryRef/wix:Directory]" />
-
- </Wix>
- </xsl:template>
-
- <xsl:template match="wix:Fragment[wix:DirectoryRef/wix:Directory]" >
- <xsl:copy>
- <xsl:apply-templates select="wix:DirectoryRef" />
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="wix:DirectoryRef" >
- <xsl:copy>
- <xsl:choose>
- <xsl:when test="wix:Directory[@Name='components']" >
- <xsl:attribute name="Id">INSTALLLOCATION</xsl:attribute>
- </xsl:when>
- <xsl:otherwise>
- <xsl:attribute name="Id"><xsl:value-of select="@Id" /></xsl:attribute>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:apply-templates />
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="wix:Directory" >
- <xsl:copy>
- <xsl:attribute name="Id"><xsl:value-of select="@Id" /></xsl:attribute>
- <xsl:attribute name="Name"><xsl:value-of select="@Name" /></xsl:attribute>
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="wix:Component">
- <xsl:element name="ComponentRef" xmlns="http://schemas.microsoft.com/wix/2006/wi" >
- <xsl:attribute name="Id">
- <xsl:value-of select="@Id" />
- </xsl:attribute>
- </xsl:element>
- </xsl:template>
-
-</xsl:stylesheet>
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/idl/IdlCMakeLists.txt.vsl
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/idl/IdlCMakeLists.txt.vsl 2017-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/idl/IdlCMakeLists.txt.vsl 2017-03-20 08:17:37 UTC (rev 705)
@@ -1,8 +1,5 @@
set(idls ${tmpltHelper.getIDLFilesforIDLCMake(${rtcParam})})
-install(FILES ${dol}{idls} DESTINATION ${dol}{INC_INSTALL_DIR}/idl
- COMPONENT idl)
-
macro(_IDL_OUTPUTS _idl _dir _result)
set(${_result} ${_dir}/${_idl}SK.cc ${_dir}/${_idl}.hh
${_dir}/${_idl}DynSK.cc)
@@ -49,8 +46,4 @@
OPENRTM_COMPILE_IDL_FILES(${dol}{idls})
set(ALL_IDL_SRCS ${dol}{ALL_IDL_SRCS} PARENT_SCOPE)
-FILTER_LIST("${dol}{ALL_IDL_SRCS}" "hh${dol}" idl_headers)
-install(FILES ${dol}{idl_headers}
- DESTINATION ${dol}{INC_INSTALL_DIR}/${dol}{PROJECT_NAME_LOWER}/idl
- COMPONENT headers)
-
+FILTER_LIST("ALL_IDL_SRCS" "hh${dol}" idl_headers)
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/include/IncModuleCMakeLists.txt.vsl
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/include/IncModuleCMakeLists.txt.vsl 2017-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/include/IncModuleCMakeLists.txt.vsl 2017-03-20 08:17:37 UTC (rev 705)
@@ -1,4 +1,7 @@
-set(hdrs ${rtcParam.name}.h
+set(hdrs
+ ${rtcParam.name}.h
+#if( ${tmpltHelper.checkFSM(${rtcParam})} ) ${rtcParam.name}FSM.h
+#end
#foreach($providerIdlFile in ${rtcParam.providerIdlPathes})
${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.h
#end
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl 2017-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl 2017-03-20 08:17:37 UTC (rev 705)
@@ -1,4 +1,8 @@
-set(comp_srcs ${rtcParam.name}.cpp #foreach($providerIdlFile in ${rtcParam.providerIdlPathes})${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.cpp #end)
+set(comp_srcs
+ ${rtcParam.name}.cpp
+#if( ${tmpltHelper.checkFSM(${rtcParam})} ) ${rtcParam.name}FSM.cpp
+#end
+ #foreach($providerIdlFile in ${rtcParam.providerIdlPathes})${tmpltHelper.getFilenameNoExt(${providerIdlFile.idlFile})}${tmpltHelper.serviceImplSuffix}.cpp #end)
set(standalone_srcs ${rtcParam.name}Comp.cpp)
if (DEFINED OPENRTM_INCLUDE_DIRS)
@@ -48,10 +52,14 @@
add_executable(${dol}{PROJECT_NAME}Comp ${dol}{standalone_srcs}
${dol}{comp_srcs} ${dol}{comp_headers} ${dol}{ALL_IDL_SRCS})
+add_dependencies(${dol}{PROJECT_NAME}Comp ALL_IDL_TGT)
target_link_libraries(${dol}{PROJECT_NAME}Comp ${dol}{OPENRTM_LIBRARIES})
install(TARGETS ${dol}{PROJECT_NAME} ${dol}{PROJECT_NAME}Comp
EXPORT ${dol}{PROJECT_NAME}
- RUNTIME DESTINATION ${dol}{INSTALL_DIR} COMPONENT component
- LIBRARY DESTINATION ${dol}{INSTALL_DIR} COMPONENT component
- ARCHIVE DESTINATION ${dol}{INSTALL_DIR} COMPONENT component)
+ RUNTIME DESTINATION ${dol}{INSTALL_PREFIX} COMPONENT component
+ LIBRARY DESTINATION ${dol}{INSTALL_PREFIX} COMPONENT component
+ ARCHIVE DESTINATION ${dol}{INSTALL_PREFIX} COMPONENT component)
+
+install(FILES ${dol}{PROJECT_SOURCE_DIR}/RTC.xml DESTINATION ${dol}{INSTALL_PREFIX}
+ COMPONENT component)
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/wix.xsl.in.vsl
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/wix.xsl.in.vsl 2017-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/wix.xsl.in.vsl 2017-03-20 08:17:37 UTC (rev 705)
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:wix="http://schemas.microsoft.com/wix/2006/wi">
- <xsl:output indent="yes" method="xml"/>
-
- <xsl:template match="/wix:Wix">
- <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Product xmlns="http://schemas.microsoft.com/wix/2006/wi" Id="${WIX_PRODUCT_ID}" Name="@RTC_NAME@ @PACKAGE_VERSION@" Language="1041" Codepage="932" Version="@PACKAGE_VERSION@" Manufacturer="@RTC_VENDOR@" UpgradeCode="${WIX_UPGRADECODE}">
- <Package InstallerVersion="300" Compressed="yes" Languages='1041' SummaryCodepage='932' />
- <Media Id="1" Cabinet="@RTC_NAME at .cab" EmbedCab="yes" />
- <Directory Id="TARGETDIR" Name="SourceDir" >
- <Directory Id="ProgramFilesFolder" Name="PFILE" >
- <Directory Id="OPENRTM_DIR" Name="OpenRTM-aist" >
- <Directory Id="INSTALLLOCATION" Name="@OPENRTM_VERSION_MAJOR at .@OPENRTM_VERSION_MINOR@" />
- </Directory>
- </Directory>
- </Directory>
-
- <Feature Id="APPLICATIONS" Title="@CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME@" Level="1" Description="@CPACK_COMPONENT_APPLICATIONS_DESCRIPTION@" >
- <!-- Start Ripping through the xml -->
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\@RTC_NAME at .dll')]" />
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\@RTC_NAME at .lib')]" />
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\@RTC_NAME at Comp.exe')]" />
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\RTC.xml')]" />
- </Feature>
-
- <Feature Id="DOCUMENTS" Title="@CPACK_COMPONENT_DOCUMENTS_DISPLAY_NAME@" Level="1" Absent="allow" Description="@CPACK_COMPONENT_DOCUMENTS_DESCRIPTION@" >
- <!-- Start Ripping through the xml -->
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\doc')]" />
- </Feature>
-
- <Feature Id="SOURCES" Title="@CPACK_COMPONENT_SOURCES_DISPLAY_NAME@" Level="1" Absent="allow" Description="@CPACK_COMPONENT_SOURCES_DESCRIPTION@" >
- <!-- Start Ripping through the xml -->
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\src')]" />
- </Feature>
-
- <!--Tack on your specific wix options-->
- <UIRef Id="WixUI_FeatureTree" />
- <UIRef Id="WixUI_ErrorProgressText" />
- <WixVariable Id="WixUILicenseRtf" Value="@CPACK_RESOURCE_FILE_LICENSE@"/>
- <!-- TODO: Add Wix Specific Dialogs and features. -->
- <!-- TODO: Add artwork -->
- <!-- TODO: Add ... -->
-
- </Product>
-
- <!--Output the fragment info which heat generates-->
- <xsl:copy-of select="wix:Fragment[wix:DirectoryRef/wix:Component]" />
- <xsl:apply-templates select="wix:Fragment[wix:DirectoryRef/@Id!='TARGETDIR' and wix:DirectoryRef/wix:Directory]" />
-
- </Wix>
- </xsl:template>
-
- <xsl:template match="wix:Fragment[wix:DirectoryRef/wix:Directory]" >
- <xsl:copy>
- <xsl:apply-templates select="wix:DirectoryRef" />
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="wix:DirectoryRef" >
- <xsl:copy>
- <xsl:choose>
- <xsl:when test="wix:Directory[@Name='components']" >
- <xsl:attribute name="Id">INSTALLLOCATION</xsl:attribute>
- </xsl:when>
- <xsl:otherwise>
- <xsl:attribute name="Id"><xsl:value-of select="@Id" /></xsl:attribute>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:apply-templates />
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="wix:Directory" >
- <xsl:copy>
- <xsl:attribute name="Id"><xsl:value-of select="@Id" /></xsl:attribute>
- <xsl:attribute name="Name"><xsl:value-of select="@Name" /></xsl:attribute>
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="wix:Component">
- <xsl:element name="ComponentRef" xmlns="http://schemas.microsoft.com/wix/2006/wi" >
- <xsl:attribute name="Id">
- <xsl:value-of select="@Id" />
- </xsl:attribute>
- </xsl:element>
- </xsl:template>
-
-</xsl:stylesheet>
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-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/FSMEditorFormPage.java 2017-03-20 08:17:37 UTC (rev 705)
@@ -78,14 +78,20 @@
private void createHintSection(FormToolkit toolkit, ScrolledForm form) {
Composite composite = createHintSectionBase(toolkit, form, 3);
- createHintLabel(IMessageConstants.DOCUMENT_HINT_COMPONENT_TITLE, IMessageConstants.DOCUMENT_HINT_COMPONENT_DESC, toolkit, composite);
- createHintLabel(IMessageConstants.DOCUMENT_HINT_ETC_TITLE, IMessageConstants.DOCUMENT_HINT_ETC_DESC, toolkit, composite);
+ createHintLabel("FSM:", IMessageConstants.FSM_HINT_DESC, toolkit, composite);
+ createHintLabel("Static:", IMessageConstants.FSM_STATIC_HINT_DESC, toolkit, composite);
+ createHintLabel("Dynamic:", IMessageConstants.FSM_DYNAMIC_HINT_DESC, toolkit, composite);
+ createHintSpace(toolkit, composite);
+ createHintLabel("SCXML:", IMessageConstants.FSM_SCXML_HINT_DESC, toolkit, composite);
+ createHintLabel(IMessageConstants.FSM_SCXML_NEW + ":", IMessageConstants.FSM_SCXML_NEW_DESC, toolkit, composite);
+ createHintLabel(IMessageConstants.FSM_SCXML_EDIT + ":", IMessageConstants.FSM_SCXML_EDIT_DESC, toolkit, composite);
+ createHintLabel(IMessageConstants.FSM_SCXML_IMPORT + ":", IMessageConstants.FSM_SCXML_IMPORT_DESC, toolkit, composite);
}
private void createFSMSection(FormToolkit toolkit, ScrolledForm form) {
Section sctOverView = toolkit.createSection(form.getBody(),
Section.TITLE_BAR | Section.EXPANDED | Section.TWISTIE);
- sctOverView.setText(IMessageConstants.DOCUMENT_OVERVIEW_TITLE);
+ sctOverView.setText("FSM Component Profile");
GridData gridData = new GridData();
gridData.horizontalAlignment = GridData.FILL;
gridData.verticalAlignment = GridData.BEGINNING;
@@ -136,7 +142,7 @@
toolkit.createLabel(composite, "SCXML");
- newBtn = toolkit.createButton(composite, "New", SWT.PUSH);
+ newBtn = toolkit.createButton(composite, IMessageConstants.FSM_SCXML_NEW, SWT.PUSH);
gd = new GridData();
gd.widthHint = 100;
gd.horizontalAlignment = GridData.BEGINNING;
@@ -150,7 +156,7 @@
IFile fsmFile = project.getFile(cmpName);
if(fsmFile.exists()) {
boolean confirm = MessageDialog.openConfirm(getSite().getShell(), "FSM Editor",
- "FSM定義が存在します．上書きしてもよろしいですか？");
+ IMessageConstants.FSM_OVERWRITE);
if (!confirm) return;
}
/////
@@ -167,7 +173,7 @@
}
});
- editBtn = toolkit.createButton(composite, "Edit", SWT.PUSH);
+ editBtn = toolkit.createButton(composite, IMessageConstants.FSM_SCXML_EDIT, SWT.PUSH);
gd = new GridData();
gd.widthHint = 100;
gd.horizontalAlignment = GridData.END;
@@ -184,7 +190,7 @@
targetFile = fsmFile.getLocation().toOSString();
} else {
MessageDialog.openWarning(getSite().getShell(), "FSM Editor",
- "FSMの定義が存在しません");
+ IMessageConstants.FSM_NO_EXIST);
return;
}
@@ -201,7 +207,7 @@
}
});
/////
- importBtn = toolkit.createButton(composite, "Import", SWT.PUSH);
+ importBtn = toolkit.createButton(composite, IMessageConstants.FSM_SCXML_IMPORT, SWT.PUSH);
gd = new GridData();
gd.widthHint = 100;
gd.horizontalAlignment = GridData.BEGINNING;
@@ -215,12 +221,12 @@
IFile fsmFile = project.getFile(cmpName);
if(fsmFile.exists()) {
boolean confirm = MessageDialog.openConfirm(getSite().getShell(), "FSM Editor",
- "FSM定義が存在します．上書きしてもよろしいですか？");
+ IMessageConstants.FSM_OVERWRITE);
if (!confirm) return;
}
/////
FileDialog dialog = new FileDialog(getEditorSite().getShell(), SWT.OPEN);
- dialog.setFilterNames(new String[]{"SCXMLファイル", "XMLファイル"});
+ dialog.setFilterNames(new String[]{"SCXML File", "XML File"});
dialog.setFilterExtensions(new String[]{"*.scxml", "*.xml"});
String newFile = dialog.open();
if (newFile == null) return;
@@ -230,9 +236,9 @@
Path inputPath = FileSystems.getDefault().getPath(newFile);
Path outputPath = FileSystems.getDefault().getPath(strPath);
Files.copy(inputPath, outputPath);
- MessageDialog.openInformation(getSite().getShell(), "Save", "対象データをインポートしました");
+ MessageDialog.openInformation(getSite().getShell(), IMessageConstants.FSM_SCXML_IMPORT, IMessageConstants.FSM_IMPORT_OK);
} catch (IOException e1) {
- MessageDialog.openWarning(getSite().getShell(), "Save", "対象データのインポートに失敗しました");
+ MessageDialog.openWarning(getSite().getShell(), IMessageConstants.FSM_SCXML_IMPORT, IMessageConstants.FSM_IMPORT_NG);
e1.printStackTrace();
}
}
@@ -355,23 +361,23 @@
if(Boolean.valueOf(fsm.getValue())) {
PropertyParam fsmType = rtcParam.getProperty(IRtcBuilderConstants.PROP_TYPE_FSMTYTPE);
if(fsmType==null) {
- result = "FSM型が指定されていません";
+ result = IMessageConstants.FSM_NOT_SELECTED;
} else {
String strType = fsmType.getValue();
if(!(strType.equals(IRtcBuilderConstants.FSMTYTPE_STATIC) || strType.equals(IRtcBuilderConstants.FSMTYTPE_DYNAMIC))) {
- result = "FSM型が不正です";
+ result = IMessageConstants.FSM_TYPE_INVALID;
}
}
StateParam fsmParam = rtcParam.getFsmParam();
if(fsmParam==null) {
- result = "FSMコンポーネントの状態遷移図が設定されていません";
+ result = IMessageConstants.FSM_NO_SM;
} else {
List<String> stateList = new ArrayList<String>();
stateList.add(fsmParam.getName());
for(StateParam param : fsmParam.getAllStateList() ) {
if(stateList.contains(param.getName())) {
- result = "状態[" + param.getName() + "]が重複しています";
+ result = IMessageConstants.FSM_STATE_DUPL1 + param.getName() + IMessageConstants.FSM_STATE_DUPL2;
break;
} else {
stateList.add(param.getName());
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/IMessageConstants.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/IMessageConstants.java 2017-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/IMessageConstants.java 2017-03-20 08:17:37 UTC (rev 705)
@@ -437,7 +437,49 @@
public static final String ACTIVITY_HINT_POSTCONDITION_TITLE = Messages.getString("IMessageConstants.ACTIVITY_HINT_POSTCONDITION_TITLE"); //$NON-NLS-1$
public static final String ACTIVITY_HINT_POSTCONDITION_DESC = Messages.getString("IMessageConstants.ACTIVITY_HINT_POSTCONDITION_DESC"); //$NON-NLS-1$
+ public static final String FSM_HINT_DESC_P1 = Messages.getString("IMessageConstants.FSM_HINT_DESC_P1"); //$NON-NLS-1$
+ public static final String FSM_HINT_DESC_P2 = Messages.getString("IMessageConstants.FSM_HINT_DESC_P2"); //$NON-NLS-1$
+ public static final String FSM_HINT_DESC = StringUtil.connectMessageWithSepalator( new String[]{FSM_HINT_DESC_P1, FSM_HINT_DESC_P2});
+ public static final String FSM_STATIC_HINT_DESC_P1 = Messages.getString("IMessageConstants.FSM_STATIC_HINT_DESC_P1"); //$NON-NLS-1$
+ public static final String FSM_STATIC_HINT_DESC_P2 = Messages.getString("IMessageConstants.FSM_STATIC_HINT_DESC_P2"); //$NON-NLS-1$
+ public static final String FSM_STATIC_HINT_DESC_P3 = Messages.getString("IMessageConstants.FSM_STATIC_HINT_DESC_P3"); //$NON-NLS-1$
+ public static final String FSM_STATIC_HINT_DESC_P4 = Messages.getString("IMessageConstants.FSM_STATIC_HINT_DESC_P4"); //$NON-NLS-1$
+ public static final String FSM_STATIC_HINT_DESC_P5 = Messages.getString("IMessageConstants.FSM_STATIC_HINT_DESC_P5"); //$NON-NLS-1$
+ public static final String FSM_STATIC_HINT_DESC = StringUtil.connectMessageWithSepalator( new String[]{FSM_STATIC_HINT_DESC_P1, FSM_STATIC_HINT_DESC_P2, FSM_STATIC_HINT_DESC_P3, FSM_STATIC_HINT_DESC_P4, FSM_STATIC_HINT_DESC_P5});
+
+ public static final String FSM_DYNAMIC_HINT_DESC_P1 = Messages.getString("IMessageConstants.FSM_DYNAMIC_HINT_DESC_P1"); //$NON-NLS-1$
+ public static final String FSM_DYNAMIC_HINT_DESC_P2 = Messages.getString("IMessageConstants.FSM_DYNAMIC_HINT_DESC_P2"); //$NON-NLS-1$
+ public static final String FSM_DYNAMIC_HINT_DESC_P3 = Messages.getString("IMessageConstants.FSM_DYNAMIC_HINT_DESC_P3"); //$NON-NLS-1$
+ public static final String FSM_DYNAMIC_HINT_DESC_P4 = Messages.getString("IMessageConstants.FSM_DYNAMIC_HINT_DESC_P4"); //$NON-NLS-1$
+ public static final String FSM_DYNAMIC_HINT_DESC_P5 = Messages.getString("IMessageConstants.FSM_DYNAMIC_HINT_DESC_P5"); //$NON-NLS-1$
+ public static final String FSM_DYNAMIC_HINT_DESC = StringUtil.connectMessageWithSepalator( new String[]{FSM_DYNAMIC_HINT_DESC_P1, FSM_DYNAMIC_HINT_DESC_P2, FSM_DYNAMIC_HINT_DESC_P3, FSM_DYNAMIC_HINT_DESC_P4, FSM_DYNAMIC_HINT_DESC_P5});
+
+ public static final String FSM_SCXML_HINT_DESC = Messages.getString("IMessageConstants.FSM_SCXML_HINT_DESC"); //$NON-NLS-1$
+ public static final String FSM_SCXML_NEW = Messages.getString("IMessageConstants.FSM_SCXML_NEW"); //$NON-NLS-1$
+ public static final String FSM_SCXML_NEW_DESC_P1 = Messages.getString("IMessageConstants.FSM_SCXML_NEW_DESC_P1"); //$NON-NLS-1$
+ public static final String FSM_SCXML_NEW_DESC_P2 = Messages.getString("IMessageConstants.FSM_SCXML_NEW_DESC_P2"); //$NON-NLS-1$
+ public static final String FSM_SCXML_NEW_DESC_P3 = Messages.getString("IMessageConstants.FSM_SCXML_NEW_DESC_P3"); //$NON-NLS-1$
+ public static final String FSM_SCXML_NEW_DESC = StringUtil.connectMessageWithSepalator( new String[]{FSM_SCXML_NEW_DESC_P1, FSM_SCXML_NEW_DESC_P2, FSM_SCXML_NEW_DESC_P3});
+ public static final String FSM_SCXML_EDIT = Messages.getString("IMessageConstants.FSM_SCXML_EDIT"); //$NON-NLS-1$
+ public static final String FSM_SCXML_EDIT_DESC_P1 = Messages.getString("IMessageConstants.FSM_SCXML_EDIT_DESC_P1"); //$NON-NLS-1$
+ public static final String FSM_SCXML_EDIT_DESC_P2 = Messages.getString("IMessageConstants.FSM_SCXML_EDIT_DESC_P2"); //$NON-NLS-1$
+ public static final String FSM_SCXML_EDIT_DESC = StringUtil.connectMessageWithSepalator( new String[]{FSM_SCXML_EDIT_DESC_P1, FSM_SCXML_EDIT_DESC_P2});
+ public static final String FSM_SCXML_IMPORT = Messages.getString("IMessageConstants.FSM_SCXML_IMPORT"); //$NON-NLS-1$
+ public static final String FSM_SCXML_IMPORT_DESC_P1 = Messages.getString("IMessageConstants.FSM_SCXML_IMPORT_DESC_P1"); //$NON-NLS-1$
+ public static final String FSM_SCXML_IMPORT_DESC_P2 = Messages.getString("IMessageConstants.FSM_SCXML_IMPORT_DESC_P2"); //$NON-NLS-1$
+ public static final String FSM_SCXML_IMPORT_DESC = StringUtil.connectMessageWithSepalator( new String[]{FSM_SCXML_IMPORT_DESC_P1, FSM_SCXML_IMPORT_DESC_P2});
+
+ public static final String FSM_OVERWRITE = Messages.getString("IMessageConstants.FSM_OVERWRITE"); //$NON-NLS-1$
+ public static final String FSM_NO_EXIST = Messages.getString("IMessageConstants.FSM_NO_EXIST"); //$NON-NLS-1$
+ public static final String FSM_IMPORT_OK = Messages.getString("IMessageConstants.FSM_IMPORT_OK"); //$NON-NLS-1$
+ public static final String FSM_IMPORT_NG = Messages.getString("IMessageConstants.FSM_IMPORT_NG"); //$NON-NLS-1$
+ public static final String FSM_NOT_SELECTED = Messages.getString("IMessageConstants.FSM_NOT_SELECTED"); //$NON-NLS-1$
+ public static final String FSM_TYPE_INVALID = Messages.getString("IMessageConstants.FSM_TYPE_INVALID"); //$NON-NLS-1$
+ public static final String FSM_NO_SM = Messages.getString("IMessageConstants.FSM_NO_SM"); //$NON-NLS-1$
+ public static final String FSM_STATE_DUPL1 = Messages.getString("IMessageConstants.STATE_DUPL1"); //$NON-NLS-1$
+ public static final String FSM_STATE_DUPL2 = Messages.getString("IMessageConstants.STATE_DUPL2"); //$NON-NLS-1$
+
public static final String PREF_IDL_SELECTION = Messages.getString("IMessageConstants.PREF_IDL_SELECTION"); //$NON-NLS-1$
public static final String PREF_IDLPARSE_NOFILE = Messages.getString("IMessageConstants.PREF_IDLPARSE_NOFILE"); //$NON-NLS-1$
public static final String PREF_IDLPARSE_ERROR_P1 = Messages.getString("IMessageConstants.PREF_IDLPARSE_ERROR_P1"); //$NON-NLS-1$
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/TestBase.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/TestBase.java 2017-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/TestBase.java 2017-03-20 08:17:37 UTC (rev 705)
@@ -15,6 +15,7 @@
protected String expPath;
protected String expContent;
protected int index;
+ protected final int default_file_num = 26;
public TestBase () {
File fileCurrent = new File(".");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java 2017-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java 2017-03-20 08:17:37 UTC (rev 705)
@@ -64,7 +64,7 @@
}
private void checkResults(List<GeneratedResult> result, String resourceDir) {
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java 2017-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java 2017-03-20 08:17:37 UTC (rev 705)
@@ -62,7 +62,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/operation/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -96,7 +96,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/attribute/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -149,7 +149,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/service2/";
- assertEquals(29, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -193,7 +193,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/service1/";
- assertEquals(29, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -226,7 +226,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/outport2/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -256,7 +256,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/outport1/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -283,7 +283,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/inport2/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -309,7 +309,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/inport1/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "testComp.cpp");
checkCode(result, resourceDir, "test.h");
checkCode(result, resourceDir, "test.cpp");
@@ -331,7 +331,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/name/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java 2017-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java 2017-03-20 08:17:37 UTC (rev 705)
@@ -88,23 +88,13 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(29, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "src/fooComp.cpp");
checkCode(result, resourceDir, "include/foo/foo.h");
checkCode(result, resourceDir, "src/foo.cpp");
checkCode(result, resourceDir, "include/foo/MyServiceSVC_impl.h");
checkCode(result, resourceDir, "src/MyServiceSVC_impl.cpp");
//
-// checkCode(result, resourceDir, "CMakeLists.txt");
-// checkCode(result, resourceDir, "Doxyfile.in");
-// checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
-// checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
-// checkCode(result, resourceDir, "cmake_modules/FindOpenRTM.cmake");
-// checkCode(result, resourceDir, "cpack_resources/Description.txt");
-// checkCode(result, resourceDir, "cpack_resources/License.txt");
-// checkCode(result, resourceDir, "cpack_resources/License.rtf");
-// checkCode(result, resourceDir, "cpack_resources/wix.xsl.in");
- //
nonexist(result, resourceDir, "Makefile.foo");
nonexist(result, resourceDir, "foo_vc8.sln");
nonexist(result, resourceDir, "foo_vc8.vcproj");
@@ -167,7 +157,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(31, result.size());
+ assertEquals(default_file_num+4, result.size());
checkCode(result, resourceDir, "src/fooComp.cpp");
checkCode(result, resourceDir, "include/foo/foo.h");
checkCode(result, resourceDir, "src/foo.cpp");
@@ -176,16 +166,6 @@
checkCode(result, resourceDir, "include/foo/MyServiceChildWithTypeSVC_impl.h");
checkCode(result, resourceDir, "src/MyServiceChildWithTypeSVC_impl.cpp");
//
-// checkCode(result, resourceDir, "CMakeLists.txt");
-// checkCode(result, resourceDir, "Doxyfile.in");
-// checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
-// checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
-// checkCode(result, resourceDir, "cmake_modules/FindOpenRTM.cmake");
-// checkCode(result, resourceDir, "cpack_resources/Description.txt");
-// checkCode(result, resourceDir, "cpack_resources/License.txt");
-// checkCode(result, resourceDir, "cpack_resources/License.rtf");
-// checkCode(result, resourceDir, "cpack_resources/wix.xsl.in");
- //
nonexist(result, resourceDir, "Makefile.foo");
nonexist(result, resourceDir, "foo_vc8.sln");
nonexist(result, resourceDir, "foo_vc8.vcproj");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConfigSetTest.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConfigSetTest.java 2017-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConfigSetTest.java 2017-03-20 08:17:37 UTC (rev 705)
@@ -111,7 +111,7 @@
}
private void checkResults(List<GeneratedResult> result, String resourceDir) {
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConstraint.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConstraint.java 2017-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConstraint.java 2017-03-20 08:17:37 UTC (rev 705)
@@ -76,7 +76,7 @@
}
private void checkResults(List<GeneratedResult> result, String resourceDir) {
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXContentTest.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXContentTest.java 2017-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXContentTest.java 2017-03-20 08:17:37 UTC (rev 705)
@@ -58,7 +58,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Content/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java 2017-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java 2017-03-20 08:17:37 UTC (rev 705)
@@ -60,7 +60,7 @@
String resourceDir = rootPath + "/resource/100/CXX/DataPortIDL/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java 2017-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java 2017-03-20 08:17:37 UTC (rev 705)
@@ -228,7 +228,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Doc/fullLong/";
- assertEquals(29, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXExCxtTest.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXExCxtTest.java 2017-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXExCxtTest.java 2017-03-20 08:17:37 UTC (rev 705)
@@ -52,7 +52,7 @@
String resourceDir = rootPath + "/resource/100/CXX/ExecutionCxt/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java 2017-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java 2017-03-20 08:17:37 UTC (rev 705)
@@ -78,7 +78,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(29, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -127,7 +127,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(31, result.size());
+ assertEquals(default_file_num+4, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java 2017-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java 2017-03-20 08:17:37 UTC (rev 705)
@@ -54,7 +54,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlmodule/serviceM/";
- assertEquals(29, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -89,7 +89,7 @@
String resourceDir = rootPath
+ "/resource/100/CXX/idlmodule/serviceCon/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -124,7 +124,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlmodule/serviceArg/";
- assertEquals(29, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -158,7 +158,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlmodule/serviceArgStruct/";
- assertEquals(29, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java 2017-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java 2017-03-20 08:17:37 UTC (rev 705)
@@ -76,7 +76,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlpath/IDLPath3/";
- assertEquals(29, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -131,7 +131,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlpath/IDLPath2/";
- assertEquals(29, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -185,7 +185,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlpath/IDLPath1/";
- assertEquals(29, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLStructTest.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLStructTest.java 2017-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLStructTest.java 2017-03-20 08:17:37 UTC (rev 705)
@@ -57,7 +57,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlstruct/";
- assertEquals(29, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "TestModuleComp.cpp");
checkCode(result, resourceDir, "TestModule.h");
checkCode(result, resourceDir, "TestModule.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java 2017-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java 2017-03-20 08:17:37 UTC (rev 705)
@@ -56,7 +56,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idltype/Struct/";
- assertEquals(29, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "ModuleNameComp.cpp");
checkCode(result, resourceDir, "ModuleName.h");
checkCode(result, resourceDir, "ModuleName.cpp");
@@ -92,7 +92,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idltype/SeqString/";
- assertEquals(29, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -163,7 +163,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idltype/Struct2/";
- assertEquals(29, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "ModuleNameComp.cpp");
checkCode(result, resourceDir, "ModuleName.h");
checkCode(result, resourceDir, "ModuleName.cpp");
@@ -200,7 +200,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idltype/IDLType1/";
- assertEquals(29, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "ModuleNameComp.cpp");
checkCode(result, resourceDir, "ModuleName.h");
checkCode(result, resourceDir, "ModuleName.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java 2017-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java 2017-03-20 08:17:37 UTC (rev 705)
@@ -53,7 +53,7 @@
String resourceDir = rootPath + "/resource/100/CXX/impl/all/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -80,7 +80,7 @@
String resourceDir = rootPath + "/resource/100/CXX/impl/execute/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -106,7 +106,7 @@
String resourceDir = rootPath + "/resource/100/CXX/impl/finalize/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -129,7 +129,7 @@
String resourceDir = rootPath + "/resource/100/CXX/impl/initialize/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java 2017-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java 2017-03-20 08:17:37 UTC (rev 705)
@@ -47,7 +47,7 @@
String resourceDir = rootPath + "/resource/100/CXX/library/library2/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -73,7 +73,7 @@
String resourceDir = rootPath + "/resource/100/CXX/library/library1/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
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-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXManipTest.java 2017-03-20 08:17:37 UTC (rev 705)
@@ -54,7 +54,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlmodule/serviceArgStruct/";
- assertEquals(29, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -90,7 +90,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idltype/IDLType1/";
- assertEquals(29, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "ModuleNameComp.cpp");
checkCode(result, resourceDir, "ModuleName.h");
checkCode(result, resourceDir, "ModuleName.cpp");
@@ -126,7 +126,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Manip/";
- assertEquals(29, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "ModuleNameComp.cpp");
checkCode(result, resourceDir, "ModuleName.h");
checkCode(result, resourceDir, "ModuleName.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java 2017-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java 2017-03-20 08:17:37 UTC (rev 705)
@@ -87,7 +87,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Multi/ProConMulti/";
- assertEquals(31, result.size());
+ assertEquals(default_file_num+4, result.size());
checkResults(result, resourceDir);
checkCode(result, resourceDir, "MyServiceSVC_impl.h");
checkCode(result, resourceDir, "MyServiceSVC_impl.cpp");
@@ -119,7 +119,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Multi/ConMulti/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkResults(result, resourceDir);
nonexist(result, resourceDir, "MyServiceSVC_impl.h");
nonexist(result, resourceDir, "MyServiceSVC_impl.cpp");
@@ -151,7 +151,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Multi/ProMulti/";
- assertEquals(31, result.size());
+ assertEquals(default_file_num+4, result.size());
checkResults(result, resourceDir);
checkCode(result, resourceDir, "MyServiceSVC_impl.h");
checkCode(result, resourceDir, "MyServiceSVC_impl.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java 2017-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java 2017-03-20 08:17:37 UTC (rev 705)
@@ -219,7 +219,7 @@
}
private void checkResults(List<GeneratedResult> result, String resourceDir) {
- assertEquals(29, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXSystemConfigTest.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXSystemConfigTest.java 2017-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXSystemConfigTest.java 2017-03-20 08:17:37 UTC (rev 705)
@@ -58,7 +58,7 @@
String resourceDir = rootPath + "/resource/100/CXX/SystemConfig/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java 2017-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java 2017-03-20 08:17:37 UTC (rev 705)
@@ -53,7 +53,7 @@
List<GeneratedResult> result = generator.generateTemplateCode(genParam);
String targetDir = rootPath + "/resource/100/CXX/AIST2/";
- assertEquals(29, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, targetDir, "ModuleNameComp.cpp");
checkCode(result, targetDir, "ModuleName.h");
checkCode(result, targetDir, "ModuleName.cpp");
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java 2017-03-20 08:16:44 UTC (rev 704)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java 2017-03-20 08:17:37 UTC (rev 705)
@@ -76,7 +76,7 @@
String resourceDir = rootPath
+ "/resource/100/CXX/Variable/ServicePort2/";
- assertEquals(29, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -131,7 +131,7 @@
String resourceDir = rootPath
+ "/resource/100/CXX/Variable/ServicePort1/";
- assertEquals(29, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -167,7 +167,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Variable/DataPort/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
openrtm-commit メーリングリストの案内