[openrtm-commit:03235] r815 - trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.lua/src/jp/go/aist/rtm/rtcbuilder/lua/template/cmake

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2018-03-09 22:39:30 +0900 (Fri, 09 Mar 2018)
New Revision: 815

Modified:
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.lua/src/jp/go/aist/rtm/rtcbuilder/lua/template/cmake/CMakeLists.txt.vsl
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.lua/src/jp/go/aist/rtm/rtcbuilder/lua/template/cmake/postinst.in.vsl
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.lua/src/jp/go/aist/rtm/rtcbuilder/lua/template/cmake/wix_patch.xml.in.vsl
Log:


Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.lua/src/jp/go/aist/rtm/rtcbuilder/lua/template/cmake/CMakeLists.txt.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.lua/src/jp/go/aist/rtm/rtcbuilder/lua/template/cmake/CMakeLists.txt.vsl	2018-03-09 06:41:17 UTC (rev 814)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.lua/src/jp/go/aist/rtm/rtcbuilder/lua/template/cmake/CMakeLists.txt.vsl	2018-03-09 13:39:30 UTC (rev 815)
@@ -89,19 +89,10 @@
 #foreach($p in ${rtcParam.consumerIdlPathes})
               ${p.idlFile}
 #end)
-
-if(WIN32)
-    set(SCRIPT_FILE ""
-                    idlcompile.bat delete.bat)
-else()
-    set(SCRIPT_FILE ""
-                    idlcompile.sh)
-endif()
 #end
 
 set(EXEC_FILES ""
                ${rtcParam.name}.lua
-#if(${rtcParam.servicePorts.size()}>0)               ${dol}{SCRIPT_FILE}#end
 )
 
 set(OTHER_SRCS CMakeLists.txt
@@ -114,7 +105,7 @@
    set(OPENRTM_SHARE_PREFIX "OpenRTM-aist/${dol}{RTM_VER}/Components/${dol}{PROJECT_TYPE}")
    set(INSTALL_PREFIX ${dol}{PROJECT_NAME})
    if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-      set(CMAKE_INSTALL_PREFIX "${dol}{OPENRTM_DIR}Components/${dol}{PROJECT_TYPE}/${dol}{PROJECT_NAME}" CACHE PATH "..." FORCE)
+      set(CMAKE_INSTALL_PREFIX "${dol}{OPENRTM_DIR}/Components/${dol}{PROJECT_TYPE}/${dol}{PROJECT_NAME}" CACHE PATH "..." FORCE)
    endif()
 else()
    set(OPENRTM_SHARE_PREFIX "share/openrtm-${dol}{OPENRTM_VERSION_MAJOR}.${dol}{OPENRTM_VERSION_MINOR}")
@@ -144,7 +135,7 @@
     COMMAND ${dol}{CMAKE_COMMAND} -E copy
         ${dol}{PROJECT_SOURCE_DIR}/${dol}{target} ${dol}{PROJECT_BINARY_DIR}
   )
-endforeach()          
+endforeach()
 
 install(PROGRAMS ${dol}{EXEC_FILES} DESTINATION "${dol}{INSTALL_PREFIX}"
         COMPONENT component)
@@ -162,7 +153,7 @@
     "${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 
+add_custom_target(uninstall COMMAND
     ${dol}{CMAKE_COMMAND} -P ${dol}{CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
 
 if(WIN32)

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.lua/src/jp/go/aist/rtm/rtcbuilder/lua/template/cmake/postinst.in.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.lua/src/jp/go/aist/rtm/rtcbuilder/lua/template/cmake/postinst.in.vsl	2018-03-09 06:41:17 UTC (rev 814)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.lua/src/jp/go/aist/rtm/rtcbuilder/lua/template/cmake/postinst.in.vsl	2018-03-09 13:39:30 UTC (rev 815)
@@ -1,5 +1,3 @@
 ${sharp}!/bin/sh
 ${sharp} postinst script
-set -e
-cd /usr/@INSTALL_PREFIX@
-sh idlcompile.sh
+set -e
\ No newline at end of file

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.lua/src/jp/go/aist/rtm/rtcbuilder/lua/template/cmake/wix_patch.xml.in.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.lua/src/jp/go/aist/rtm/rtcbuilder/lua/template/cmake/wix_patch.xml.in.vsl	2018-03-09 06:41:17 UTC (rev 814)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.lua/src/jp/go/aist/rtm/rtcbuilder/lua/template/cmake/wix_patch.xml.in.vsl	2018-03-09 13:39:30 UTC (rev 815)
@@ -1,24 +1,2 @@
 <CPackWiXPatch>
-	<CPackWiXFragment Id="${sharp}PRODUCT">
-		<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="PostinstAction"
-        Before="InstallFinalize">
-				NOT Installed 
-			</Custom>
-		</InstallExecuteSequence>
-		<InstallExecuteSequence>
-			<Custom Action="PrermAction"
-        Before="RemoveFiles">
-				Installed 
-			</Custom>
-		</InstallExecuteSequence>
-	</CPackWiXFragment>
 </CPackWiXPatch>