[openrtm-commit:01494] r527 - in trunk/rtmtools: . jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2014年 10月 29日 (水) 11:44:34 JST
Author: kawauchi
Date: 2014-10-29 11:44:34 +0900 (Wed, 29 Oct 2014)
New Revision: 527
Added:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/Description.txt.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/License.txt.vsl
Modified:
trunk/rtmtools/
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/template/cmake/CMakeLists.txt.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl
trunk/rtmtools/version
Log:
Merged r518-526 from branches/work_kawauchi
Property changes on: trunk/rtmtools
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/work_kawauchi/rtmtools:518-526
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl 2014-10-27 07:46:42 UTC (rev 526)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/CMakeLists.txt.vsl 2014-10-29 02:44:34 UTC (rev 527)
@@ -1,4 +1,7 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
+if(POLICY CMP0048)
+ cmake_policy(SET CMP0048 OLD)
+endif()
project(${rtcParam.name})
string(TOLOWER ${dol}{PROJECT_NAME} PROJECT_NAME_LOWER)
@@ -45,7 +48,7 @@
"components/share/${dol}{PROJECT_NAME_LOWER}-${dol}{PROJECT_VERSION_MAJOR}")
${sharp} Get necessary dependency information
-find_package(OpenRTM)
+find_package(OpenRTM HINTS /usr/lib64/openrtm-1.1/cmake)
if(${dol}{OpenRTM_FOUND})
MESSAGE(STATUS "OpenRTM configuration Found")
else(${dol}{OpenRTM_FOUND})
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl 2014-10-27 07:46:42 UTC (rev 526)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl 2014-10-29 02:44:34 UTC (rev 527)
@@ -40,6 +40,9 @@
${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})
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 2014-10-27 07:46:42 UTC (rev 526)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonCMakeGenerateManager.java 2014-10-29 02:44:34 UTC (rev 527)
@@ -50,6 +50,13 @@
public List<GeneratedResult> generateTemplateCode10(
Map<String, Object> contextMap) {
List<GeneratedResult> result = super.generateTemplateCode10(contextMap);
+
+ GeneratedResult gr;
+ gr = generateResourceDescriptionTXT(contextMap);
+ result.add(gr);
+ gr = generateResourceLicenseTXT(contextMap);
+ result.add(gr);
+
return result;
}
@@ -81,6 +88,18 @@
return generatePython(infile, outfile, contextMap);
}
+ public GeneratedResult generateResourceDescriptionTXT(Map<String, Object> contextMap) {
+ String outfile = "cpack_resources/Description.txt";
+ String infile = "cmake/Description.txt.vsl";
+ return generatePython(infile, outfile, contextMap);
+ }
+
+ public GeneratedResult generateResourceLicenseTXT(Map<String, Object> contextMap) {
+ String outfile = "cpack_resources/License.txt";
+ String infile = "cmake/License.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/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 2014-10-27 07:46:42 UTC (rev 526)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/CMakeLists.txt.vsl 2014-10-29 02:44:34 UTC (rev 527)
@@ -38,7 +38,7 @@
#end
)
-set(OTHER_SRCS CMakeLists.txt Doxyfile.in
+set(OTHER_SRCS CMakeLists.txt
RTC.xml ${rtcParam.name}.conf rtc.conf)
@@ -74,8 +74,8 @@
${sharp} add uninstall target
configure_file(
- "${dol}{CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/cmake_uninstall.cmake.in"
- "${dol}{CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+ "${dol}{CMAKE_CURRENT_SOURCE_DIR}/cmake/uninstall_target.cmake.in"
+ "${dol}{CMAKE_CURRENT_BINARY_DIR}/uninstall_target.cmake"
IMMEDIATE @ONLY)
add_custom_target(uninstall COMMAND
${dol}{CMAKE_COMMAND} -P ${dol}{CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
@@ -105,11 +105,11 @@
${sharp} target settings for document
-configure_file("${dol}{CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in"
- "${dol}{CMAKE_CURRENT_BINARY_DIR}/Doxyfile")
+configure_file("${dol}{CMAKE_CURRENT_SOURCE_DIR}/doc/doxyfile.in"
+ "${dol}{CMAKE_CURRENT_BINARY_DIR}/doc/doxyfile")
add_custom_target(doxygen COMMAND
- ${dol}{DOXYGEN_EXECUTABLE} ${dol}{CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
+ ${dol}{DOXYGEN_EXECUTABLE} ${dol}{CMAKE_CURRENT_BINARY_DIR}/doxyfile)
set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc)
Copied: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/Description.txt.vsl (from rev 526, branches/work_kawauchi/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/Description.txt.vsl)
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/Description.txt.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/Description.txt.vsl 2014-10-29 02:44:34 UTC (rev 527)
@@ -0,0 +1,4 @@
+DESCRIPTION
+===========
+
+This is an installer created using CPack (http://www.cmake.org). No additional installation instructions provided.
Copied: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/License.txt.vsl (from rev 526, branches/work_kawauchi/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/License.txt.vsl)
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/License.txt.vsl (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/License.txt.vsl 2014-10-29 02:44:34 UTC (rev 527)
@@ -0,0 +1,4 @@
+LICENSE
+=======
+
+This is an installer created using CPack (http://www.cmake.org). No license provided.
Modified: trunk/rtmtools/version
===================================================================
--- trunk/rtmtools/version 2014-10-27 07:46:42 UTC (rev 526)
+++ trunk/rtmtools/version 2014-10-29 02:44:34 UTC (rev 527)
@@ -1,2 +1,2 @@
VERSION=1.1.0
-PROJECT_VERSION=${VERSION}.rc4v$(date +%Y%m%d)
+PROJECT_VERSION=${VERSION}.rc5v$(date +%Y%m%d)
More information about the openrtm-commit
mailing list