[openrtm-commit:02541] r711 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python: src/jp/go/aist/rtm/rtcbuilder/python/manager src/jp/go/aist/rtm/rtcbuilder/python/template/cmake src/jp/go/aist/rtm/rtcbuilder/python/template/python test/jp/go/aist/rtm/rtcbuilder/python/_test test/jp/go/aist/rtm/rtcbuilder/python/_test/_100
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 3月 30日 (木) 14:55:11 JST
Author: ga
Date: 2017-03-30 14:55:11 +0900 (Thu, 30 Mar 2017)
New Revision: 711
Added:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/SrcCMakeLists.txt.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/cpack_options_cmake.in.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/delete.bat.vsl
Modified:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonCMakeGenerateManager.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonGenerateManager.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/CMakeLists.txt.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/wix_patch.xml.in.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/idlcompile.bat.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/TestBase.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/AISTTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BaseTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BuildTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyDocTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLInheritTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLType.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyModuleTest.java
Log:
Modified generated CMakeFile for Python #3992
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonCMakeGenerateManager.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonCMakeGenerateManager.java 2017-03-27 18:19:38 UTC (rev 710)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonCMakeGenerateManager.java 2017-03-30 05:55:11 UTC (rev 711)
@@ -8,10 +8,8 @@
import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
import jp.go.aist.rtm.rtcbuilder.manager.CMakeGenerateManager;
import jp.go.aist.rtm.rtcbuilder.template.TemplateUtil;
-
import static jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants.*;
import static jp.go.aist.rtm.rtcbuilder.util.RTCUtil.form;
-
import static jp.go.aist.rtm.rtcbuilder.python.IRtcBuilderConstantsPython.LANG_PYTHON;
import static jp.go.aist.rtm.rtcbuilder.python.IRtcBuilderConstantsPython.LANG_PYTHON_ARG;
@@ -93,6 +91,20 @@
return generatePython(infile, outfile, contextMap);
}
+ @Override
+ public GeneratedResult generateCmakeCPackOption(Map<String, Object> contextMap) {
+ String outfile = "cmake/cpack_options.cmake.in";
+ String infile = "cmake/cpack_options_cmake.in.vsl";
+ return generatePython(infile, outfile, contextMap);
+ }
+
+ @Override
+ public GeneratedResult generateSrcCMakeLists(Map<String, Object> contextMap) {
+ String outfile = "src/CMakeLists.txt";
+ String infile = "cmake/SrcCMakeLists.txt.vsl";
+ return generatePython(infile, outfile, contextMap);
+ }
+ /////
public GeneratedResult generatePython(String infile, String outfile,
Map<String, Object> contextMap) {
try {
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonGenerateManager.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonGenerateManager.java 2017-03-27 18:19:38 UTC (rev 710)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonGenerateManager.java 2017-03-30 05:55:11 UTC (rev 711)
@@ -118,6 +118,8 @@
result.add(gr);
gr = generateIDLCompileSh(contextMap);
result.add(gr);
+ gr = generateDeleteBat(contextMap);
+ result.add(gr);
}
for (IdlFileParam idlFileParam : rtcParam.getProviderIdlPathes()) {
@@ -170,6 +172,14 @@
return generate(infile, outfile, contextMap);
}
+ public GeneratedResult generateDeleteBat(Map<String, Object> contextMap) {
+ String outfile = "delete.bat";
+ String infile = "python/delete.bat.vsl";
+ GeneratedResult result = generate(infile, outfile, contextMap);
+ result.setEncode("Shift_JIS");
+ return result;
+ }
+
public GeneratedResult generate(String infile, String outfile,
Map<String, Object> contextMap) {
try {
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/CMakeLists.txt.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/CMakeLists.txt.vsl 2017-03-27 18:19:38 UTC (rev 710)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/CMakeLists.txt.vsl 2017-03-30 05:55:11 UTC (rev 711)
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-if(POLICY CMP0048)
- cmake_policy(SET CMP0048 OLD)
+if(POLICY CMP0040)
+ cmake_policy(SET CMP0040 OLD)
endif()
if(POLICY CMP0053)
cmake_policy(SET CMP0053 OLD)
@@ -92,6 +92,14 @@
#end)
#end
+if(WIN32)
+ set(SCRIPT_FILE ""
+ idlcompile.bat delete.bat)
+else()
+ set(SCRIPT_FILE ""
+ idlcompile.sh)
+endif()
+
set(EXEC_FILES ""
${rtcParam.name}.py
#if(${rtcParam.servicePorts.size()}>0) ${dol}{SCRIPT_FILE}#end
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/SrcCMakeLists.txt.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/SrcCMakeLists.txt.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/SrcCMakeLists.txt.vsl 2017-03-30 05:55:11 UTC (rev 711)
@@ -0,0 +1,58 @@
+set(comp_srcs ${rtcParam.name}.cpp #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)
+ string(REGEX REPLACE "-I" ";"
+ OPENRTM_INCLUDE_DIRS "${dol}{OPENRTM_INCLUDE_DIRS}")
+ string(REGEX REPLACE " ;" ";"
+ OPENRTM_INCLUDE_DIRS "${dol}{OPENRTM_INCLUDE_DIRS}")
+endif (DEFINED OPENRTM_INCLUDE_DIRS)
+
+if (DEFINED OPENRTM_LIBRARY_DIRS)
+ string(REGEX REPLACE "-L" ";"
+ OPENRTM_LIBRARY_DIRS "${dol}{OPENRTM_LIBRARY_DIRS}")
+ string(REGEX REPLACE " ;" ";"
+ OPENRTM_LIBRARY_DIRS "${dol}{OPENRTM_LIBRARY_DIRS}")
+endif (DEFINED OPENRTM_LIBRARY_DIRS)
+
+if (DEFINED OPENRTM_LIBRARIES)
+ string(REGEX REPLACE "-l" ";"
+ OPENRTM_LIBRARIES "${dol}{OPENRTM_LIBRARIES}")
+ string(REGEX REPLACE " ;" ";"
+ OPENRTM_LIBRARIES "${dol}{OPENRTM_LIBRARIES}")
+endif (DEFINED OPENRTM_LIBRARIES)
+
+include_directories(${dol}{PROJECT_SOURCE_DIR}/include)
+include_directories(${dol}{PROJECT_SOURCE_DIR}/include/${dol}{PROJECT_NAME})
+include_directories(${dol}{PROJECT_BINARY_DIR})
+include_directories(${dol}{PROJECT_BINARY_DIR}/idl)
+include_directories(${dol}{OPENRTM_INCLUDE_DIRS})
+include_directories(${dol}{OMNIORB_INCLUDE_DIRS})
+add_definitions(${dol}{OPENRTM_CFLAGS})
+add_definitions(${dol}{OMNIORB_CFLAGS})
+
+MAP_ADD_STR(comp_hdrs "../" comp_headers)
+
+link_directories(${dol}{OPENRTM_LIBRARY_DIRS})
+link_directories(${dol}{OMNIORB_LIBRARY_DIRS})
+
+add_library(${dol}{PROJECT_NAME} ${dol}{LIB_TYPE} ${dol}{comp_srcs}
+ ${dol}{comp_headers} ${dol}{ALL_IDL_SRCS})
+set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
+set_source_files_properties(${dol}{ALL_IDL_SRCS} PROPERTIES GENERATED 1)
+if(NOT TARGET ALL_IDL_TGT)
+ add_custom_target(ALL_IDL_TGT)
+endif(NOT TARGET ALL_IDL_TGT)
+add_dependencies(${dol}{PROJECT_NAME} ALL_IDL_TGT)
+target_link_libraries(${dol}{PROJECT_NAME} ${dol}{OPENRTM_LIBRARIES})
+
+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_PREFIX} COMPONENT component
+ LIBRARY DESTINATION ${dol}{INSTALL_PREFIX} COMPONENT component
+ ARCHIVE DESTINATION ${dol}{INSTALL_PREFIX} COMPONENT component)
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/cpack_options_cmake.in.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/cpack_options_cmake.in.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/cpack_options_cmake.in.vsl 2017-03-30 05:55:11 UTC (rev 711)
@@ -0,0 +1,90 @@
+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@")
+
+if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+ set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at _@PROJECT_VERSION at _@CPACK_DEBIAN_PACKAGE_ARCHITECTURE@")
+#if(${rtcParam.servicePorts.size()}>0)
+ set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "@CMAKE_SOURCE_DIR@/postinst;@CMAKE_SOURCE_DIR@/prerm")
+#end
+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@")
+#if(${rtcParam.servicePorts.size()}>0)
+ set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "@CMAKE_SOURCE_DIR@/postinst")
+ set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "@CMAKE_SOURCE_DIR@/prerm")
+#end
+endif(CPACK_RPM_PACKAGE_ARCHITECTURE)
+set(CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING.LESSER")
+
+set(CPACK_COMPONENTS_ALL component)
+set(CPACK_COMPONENT_COMPONENT_DISPLAY_NAME "Applications")
+set(CPACK_COMPONENT_COMPONENT_DESCRIPTION
+ "Component library and stand-alone executable")
+if(INSTALL_HEADERS)
+ set(CPACK_COMPONENTS_ALL ${dol}{CPACK_COMPONENTS_ALL} headers)
+ set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "Header files")
+ set(CPACK_COMPONENT_HEADERS_DESCRIPTION
+ "Header files from the component.")
+ set(CPACK_COMPONENT_HEADERS_DEPENDS component)
+endif(INSTALL_HEADERS)
+if(INSTALL_IDL)
+ set(CPACK_COMPONENTS_ALL ${dol}{CPACK_COMPONENTS_ALL} idl)
+ set(CPACK_COMPONENT_IDL_DISPLAY_NAME "IDL files")
+ set(CPACK_COMPONENT_IDL_DESCRIPTION
+ "IDL files for the component's services.")
+ set(CPACK_COMPONENT_IDL_DEPENDS component)
+endif(INSTALL_IDL)
+set(INSTALL_EXAMPLES @BUILD_EXAMPLES@)
+if(INSTALL_EXAMPLES)
+ set(CPACK_COMPONENTS_ALL ${dol}{CPACK_COMPONENTS_ALL} examples)
+ set(CPACK_COMPONENT_EXAMPLES_DISPLAY_NAME "Examples")
+ set(CPACK_COMPONENT_EXAMPLES_DESCRIPTION
+ "Sample configuration files and other component resources.")
+ set(CPACK_COMPONENT_EXAMPLES_DEPENDS component)
+endif(INSTALL_EXAMPLES)
+set(INSTALL_DOCUMENTATION @BUILD_DOCUMENTATION@)
+if(INSTALL_DOCUMENTATION)
+ set(CPACK_COMPONENTS_ALL ${dol}{CPACK_COMPONENTS_ALL} documentation)
+ set(CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME "Documentation")
+ set(CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION
+ "Component documentation")
+ set(CPACK_COMPONENT_DOCUMENTATION_DEPENDS component)
+endif(INSTALL_DOCUMENTATION)
+if(INSTALL_SOURCES)
+ set(CPACK_COMPONENTS_ALL ${dol}{CPACK_COMPONENTS_ALL} sources)
+ set(CPACK_COMPONENT_SOURCES_DISPLAY_NAME "Source files")
+ set(CPACK_COMPONENT_SOURCES_DESCRIPTION
+ "Source files from the component.")
+endif(INSTALL_SOURCES)
+
+IF (WIN32)
+ set(CPACK_GENERATOR "WIX")
+ set(CPACK_RESOURCE_FILE_LICENSE
+ "@CMAKE_CURRENT_SOURCE_DIR@/cmake/License.rtf")
+ set(CPACK_PACKAGE_FILE_NAME
+ "@PROJECT_NAME@@PROJECT_SHORT_VER at _rtm@RTM_SHORT_VER at _${dol}{CPACK_SYSTEM_NAME}")
+ set(CPACK_PACKAGE_NAME ${dol}{CPACK_PACKAGE_FILE_NAME})
+ set(CPACK_UNINSTALL_NAME @PROJECT_NAME@)
+ set(CPACK_PACKAGE_INSTALL_DIRECTORY "@OPENRTM_SHARE_PREFIX@")
+
+ ${sharp} Windows WiX package settings
+ if(${dol}{CPACK_GENERATOR} MATCHES "WIX")
+ 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")
+#if(${rtcParam.servicePorts.size()}>0)
+ set(CPACK_WIX_PATCH_FILE "@WIX_PATCH_FILE@")
+#end
+ endif()
+
+ELSE(WIN32)
+ set(CPACK_GENERATOR @LINUX_PACKAGE_GENERATOR@)
+ set(CPACK_PACKAGE_CONTACT @PROJECT_MAINTAINER@)
+ENDIF (WIN32)
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/wix_patch.xml.in.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/wix_patch.xml.in.vsl 2017-03-27 18:19:38 UTC (rev 710)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/wix_patch.xml.in.vsl 2017-03-30 05:55:11 UTC (rev 711)
@@ -1,14 +1,24 @@
<CPackWiXPatch>
<CPackWiXFragment Id="${sharp}PRODUCT">
- <CustomAction Id="MyCustomAction"
+ <CustomAction Id="PostinstAction"
ExeCommand="idlcompile.bat"
Execute="deferred" Impersonate="no"
FileKey="CM_FP_component. at PROJECT_NAME@.idlcompile.bat"/>
+ <CustomAction Id="PrermAction"
+ ExeCommand="delete.bat"
+ Execute="deferred" Impersonate="no"
+ FileKey="CM_FP_component. at PROJECT_NAME@.delete.bat"/>
<InstallExecuteSequence>
- <Custom Action="MyCustomAction"
+ <Custom Action="PostinstAction"
Before="InstallFinalize">
NOT Installed
</Custom>
</InstallExecuteSequence>
+ <InstallExecuteSequence>
+ <Custom Action="PrermAction"
+ Before="RemoveFiles">
+ Installed
+ </Custom>
+ </InstallExecuteSequence>
</CPackWiXFragment>
</CPackWiXPatch>
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/delete.bat.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/delete.bat.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/delete.bat.vsl 2017-03-30 05:55:11 UTC (rev 711)
@@ -0,0 +1,8 @@
+echo off
+cd /d %~dp0
+for /d %%i in (*) do (
+ rmdir /s/q %%i
+)
+for %%i in (*.py*) do (
+ del /s/q %%i
+)
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/idlcompile.bat.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/idlcompile.bat.vsl 2017-03-27 18:19:38 UTC (rev 710)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/idlcompile.bat.vsl 2017-03-30 05:55:11 UTC (rev 711)
@@ -1,4 +1,5 @@
-echo off
+ at echo off
+cd /d %~dp0
setlocal
for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
if exist %f% (
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/TestBase.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/TestBase.java 2017-03-27 18:19:38 UTC (rev 710)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/TestBase.java 2017-03-30 05:55:11 UTC (rev 711)
@@ -17,6 +17,7 @@
protected int index;
protected String[] ignore_row_phrases = {"--service-idl=", "--consumer-idl"};
protected final int default_file_num = 24;
+ protected final int service_file_num = 7;
public TestBase () {
File fileCurrent = new File(".");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/AISTTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/AISTTest.java 2017-03-27 18:19:38 UTC (rev 710)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/AISTTest.java 2017-03-30 05:55:11 UTC (rev 711)
@@ -146,11 +146,11 @@
String resourceDir = rootPath + "/resource/100/aist/AIST4/";
- assertEquals(default_file_num+6, result.size());
+ assertEquals(default_file_num+7, result.size());
checkCode(result, resourceDir, "test.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
- checkCode(result, resourceDir, "idlcompile.bat");
- checkCode(result, resourceDir, "idlcompile.sh");
+// checkCode(result, resourceDir, "idlcompile.bat");
+// checkCode(result, resourceDir, "idlcompile.sh");
}
public void testAIST3() throws Exception {
@@ -198,11 +198,11 @@
String resourceDir = rootPath + "/resource/100/aist/AIST3/";
- assertEquals(default_file_num+6, result.size());
+ assertEquals(default_file_num+service_file_num, result.size());
checkCode(result, resourceDir, "test.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
- checkCode(result, resourceDir, "idlcompile.bat");
- checkCode(result, resourceDir, "idlcompile.sh");
+// checkCode(result, resourceDir, "idlcompile.bat");
+// checkCode(result, resourceDir, "idlcompile.sh");
}
public void testAIST2() throws Exception {
@@ -240,10 +240,10 @@
String resourceDir = rootPath + "/resource/100/aist/AIST2/";
- assertEquals(default_file_num+5, result.size());
+ assertEquals(default_file_num+6, result.size());
checkCode(result, resourceDir, "test.py");
- checkCode(result, resourceDir, "idlcompile.bat");
- checkCode(result, resourceDir, "idlcompile.sh");
+// checkCode(result, resourceDir, "idlcompile.bat");
+// checkCode(result, resourceDir, "idlcompile.sh");
}
public void testAIST1() throws Exception {
@@ -273,11 +273,11 @@
String resourceDir = rootPath + "/resource/100/aist/AIST1/";
- assertEquals(default_file_num+6, result.size());
+ assertEquals(default_file_num+service_file_num, result.size());
checkCode(result, resourceDir, "test.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
- checkCode(result, resourceDir, "idlcompile.bat");
- checkCode(result, resourceDir, "idlcompile.sh");
+// checkCode(result, resourceDir, "idlcompile.bat");
+// checkCode(result, resourceDir, "idlcompile.sh");
}
}
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BaseTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BaseTest.java 2017-03-27 18:19:38 UTC (rev 710)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BaseTest.java 2017-03-30 05:55:11 UTC (rev 711)
@@ -83,11 +83,11 @@
String resourceDir = rootPath + "/resource/100/base/service2/";
- assertEquals(default_file_num+6, result.size());
+ assertEquals(default_file_num+service_file_num, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
- checkCode(result, resourceDir, "idlcompile.bat");
- checkCode(result, resourceDir, "idlcompile.sh");
+// checkCode(result, resourceDir, "idlcompile.bat");
+// checkCode(result, resourceDir, "idlcompile.sh");
}
public void testServicePort1() throws Exception {
@@ -125,11 +125,11 @@
String resourceDir = rootPath + "/resource/100/base/service1/";
- assertEquals(default_file_num+6, result.size());
+ assertEquals(default_file_num+service_file_num, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
- checkCode(result, resourceDir, "idlcompile.bat");
- checkCode(result, resourceDir, "idlcompile.sh");
+// checkCode(result, resourceDir, "idlcompile.bat");
+// checkCode(result, resourceDir, "idlcompile.sh");
}
public void testOutPort2() throws Exception {
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BuildTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BuildTest.java 2017-03-27 18:19:38 UTC (rev 710)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BuildTest.java 2017-03-30 05:55:11 UTC (rev 711)
@@ -89,11 +89,11 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(default_file_num+6, result.size());
+ assertEquals(default_file_num+service_file_num, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
- checkCode(result, resourceDir, "idlcompile.bat");
- checkCode(result, resourceDir, "idlcompile.sh");
+// checkCode(result, resourceDir, "idlcompile.bat");
+// checkCode(result, resourceDir, "idlcompile.sh");
}
public void testCMake2() throws Exception {
@@ -147,7 +147,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(default_file_num+7, result.size());
+ assertEquals(default_file_num+8, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyServiceChildMulti_idl_example.py");
checkCode(result, resourceDir, "MyServiceChildWithType_idl_example.py");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyDocTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyDocTest.java 2017-03-27 18:19:38 UTC (rev 710)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyDocTest.java 2017-03-30 05:55:11 UTC (rev 711)
@@ -262,11 +262,11 @@
String resourceDir = rootPath + "/resource/100/Doc/full/";
- assertEquals(default_file_num+6, result.size());
+ assertEquals(default_file_num+service_file_num, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
- checkCode(result, resourceDir, "idlcompile.bat");
- checkCode(result, resourceDir, "idlcompile.sh");
+// checkCode(result, resourceDir, "idlcompile.bat");
+// checkCode(result, resourceDir, "idlcompile.sh");
}
public void testDocRefer() throws Exception {
@@ -321,11 +321,11 @@
String resourceDir = rootPath + "/resource/100/Doc/refer/";
- assertEquals(default_file_num+6, result.size());
+ assertEquals(default_file_num+service_file_num, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
- checkCode(result, resourceDir, "idlcompile.bat");
- checkCode(result, resourceDir, "idlcompile.sh");
+// checkCode(result, resourceDir, "idlcompile.bat");
+// checkCode(result, resourceDir, "idlcompile.sh");
}
public void testDocAuthorLong() throws Exception {
@@ -376,11 +376,11 @@
String resourceDir = rootPath + "/resource/100/Doc/authorLong/";
- assertEquals(default_file_num+6, result.size());
+ assertEquals(default_file_num+service_file_num, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
- checkCode(result, resourceDir, "idlcompile.bat");
- checkCode(result, resourceDir, "idlcompile.sh");
+// checkCode(result, resourceDir, "idlcompile.bat");
+// checkCode(result, resourceDir, "idlcompile.sh");
}
public void testDocAuthor() throws Exception {
@@ -430,11 +430,11 @@
String resourceDir = rootPath + "/resource/100/Doc/author/";
- assertEquals(default_file_num+6, result.size());
+ assertEquals(default_file_num+service_file_num, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
- checkCode(result, resourceDir, "idlcompile.bat");
- checkCode(result, resourceDir, "idlcompile.sh");
+// checkCode(result, resourceDir, "idlcompile.bat");
+// checkCode(result, resourceDir, "idlcompile.sh");
}
}
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLInheritTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLInheritTest.java 2017-03-27 18:19:38 UTC (rev 710)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLInheritTest.java 2017-03-30 05:55:11 UTC (rev 711)
@@ -81,7 +81,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(default_file_num+6, result.size());
+ assertEquals(default_file_num+service_file_num, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyServiceChildMulti_idl_example.py");
// checkCode(result, resourceDir, "idlcompile.bat");
@@ -129,7 +129,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(default_file_num+7, result.size());
+ assertEquals(default_file_num+8, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyServiceChildMulti_idl_example.py");
checkCode(result, resourceDir, "MyServiceChildWithType_idl_example.py");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLType.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLType.java 2017-03-27 18:19:38 UTC (rev 710)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLType.java 2017-03-30 05:55:11 UTC (rev 711)
@@ -96,11 +96,11 @@
String resourceDir = rootPath + "/resource/100/idltype/type2/";
- assertEquals(default_file_num+6, result.size());
+ assertEquals(default_file_num+7, result.size());
checkCode(result, resourceDir, "test.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
- checkCode(result, resourceDir, "idlcompile.bat");
- checkCode(result, resourceDir, "idlcompile.sh");
+// checkCode(result, resourceDir, "idlcompile.bat");
+// checkCode(result, resourceDir, "idlcompile.sh");
}
public void testBaseType() throws Exception {
@@ -130,11 +130,11 @@
String resourceDir = rootPath + "/resource/100/idltype/type3/";
- assertEquals(default_file_num+6, result.size());
+ assertEquals(default_file_num+service_file_num, result.size());
checkCode(result, resourceDir, "test.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
- checkCode(result, resourceDir, "idlcompile.bat");
- checkCode(result, resourceDir, "idlcompile.sh");
+// checkCode(result, resourceDir, "idlcompile.bat");
+// checkCode(result, resourceDir, "idlcompile.sh");
}
}
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyModuleTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyModuleTest.java 2017-03-27 18:19:38 UTC (rev 710)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyModuleTest.java 2017-03-30 05:55:11 UTC (rev 711)
@@ -64,11 +64,11 @@
String resourceDir = rootPath + "/resource/100/module/serviceM/";
- assertEquals(default_file_num+6, result.size());
+ assertEquals(default_file_num+service_file_num, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
- checkCode(result, resourceDir, "idlcompile.bat");
- checkCode(result, resourceDir, "idlcompile.sh");
+// checkCode(result, resourceDir, "idlcompile.bat");
+// checkCode(result, resourceDir, "idlcompile.sh");
}
public void testServicePortProv2() throws Exception {
@@ -104,12 +104,12 @@
String resourceDir = rootPath + "/resource/100/module/serviceM2/";
- assertEquals(default_file_num+7, result.size());
+ assertEquals(default_file_num+8, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
checkCode(result, resourceDir, "DAQService_idl_example.py");
- checkCode(result, resourceDir, "idlcompile.bat");
- checkCode(result, resourceDir, "idlcompile.sh");
+// checkCode(result, resourceDir, "idlcompile.bat");
+// checkCode(result, resourceDir, "idlcompile.sh");
}
public void testServicePortCon() throws Exception {
@@ -140,7 +140,7 @@
String resourceDir = rootPath + "/resource/100/module/serviceMC/";
- assertEquals(default_file_num+5, result.size());
+ assertEquals(default_file_num+6, result.size());
checkCode(result, resourceDir, "foo.py");
}
@@ -177,7 +177,7 @@
String resourceDir = rootPath + "/resource/100/module/serviceMC2/";
- assertEquals(default_file_num+5, result.size());
+ assertEquals(default_file_num+6, result.size());
checkCode(result, resourceDir, "foo.py");
}
openrtm-commit メーリングリストの案内