Skip to content

Commit

Permalink
install idl files under python2.7/dist-packages/, see Issue 138
Browse files Browse the repository at this point in the history
git-svn-id: https://hrpsys-base.googlecode.com/svn/trunk@872 a991ac11-fb38-5095-8c12-a1ddb0715245
  • Loading branch information
k-okada committed Oct 16, 2013
1 parent 06fc1d8 commit 2dca761
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
6 changes: 3 additions & 3 deletions idl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ install(TARGETS ${target}
if(COMPILE_JAVA_STUFF)
install(FILES ${jarfile} DESTINATION share/java)
endif()
install(CODE "execute_process(COMMAND omniidl -bpython -C${python_dist_pkg_dir} -I${OPENRTM_IDL_DIR} ${idl_files} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})")
install(CODE "execute_process(COMMAND omniidl -bpython -C${python_dist_pkg_dir} -I${OPENRTM_IDL_DIR} ${openhrp_idl_files} WORKING_DIRECTORY ${OPENHRP_DIR}/share/OpenHRP-3.1/idl/OpenHRP)")
install(CODE "execute_process(COMMAND python -m compileall . WORKING_DIRECTORY ${python_dist_pkg_dir})")
install(CODE "execute_process(COMMAND omniidl -bpython -C${python_dist_pkg_dir}/hrpsys -I${OPENRTM_IDL_DIR} ${idl_files} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})")
install(CODE "execute_process(COMMAND omniidl -bpython -C${python_dist_pkg_dir}/hrpsys -I${OPENRTM_IDL_DIR} ${openhrp_idl_files} WORKING_DIRECTORY ${OPENHRP_DIR}/share/openhrp3/share/OpenHRP-3.1/idl/OpenHRP)")
install(CODE "execute_process(COMMAND python -m compileall . WORKING_DIRECTORY ${python_dist_pkg_dir}/hrpsys)")
install(FILES ${headers} DESTINATION include/hrpsys/idl)
install(FILES ${idl_files} DESTINATION share/hrpsys/idl)

3 changes: 2 additions & 1 deletion python/hrpsys_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

from rtm import *
from OpenHRP import *
from hrpsys import * # load ModelLoader

import socket
import time
Expand Down Expand Up @@ -348,7 +349,7 @@ def getRTCInstanceList(self):
def getBodyInfo(self, url):
import CosNaming
obj = rtm.rootnc.resolve([CosNaming.NameComponent('ModelLoader', '')])
mdlldr = obj._narrow(ModelLoader)
mdlldr = obj._narrow(OpenHRP.ModelLoader_idl._0_OpenHRP__POA.ModelLoader)
print self.configurator_name, " bodyinfo URL = file://"+url
return mdlldr.getBodyInfo("file://"+url)

Expand Down

0 comments on commit 2dca761

Please sign in to comment.