Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bin/roseus: try to find irteusg, if irteusgl is not found #711

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

bin/roseus: try to find irteusg, if irteusgl is not found #711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8939a59
bin/roseus: try to find irteusg, if irteusgl is not found
k-okada May 11, 2022
65268d9
disable doc generation if 'catkin bt -vi --cmake-args -DDISABLE_DOCUM…
k-okada May 24, 2022
7b2e98e
fix log to use irteusg, if irteusgl is not found
k-okada Jul 11, 2022
f54afd5
on Pepper's PC, logic to find EUSLISP_EXE did not work..
k-okada Jul 13, 2022
c12b2c8
Merge branch 'master' into irteusg_embedded_roseus
k-okada Jan 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions roseus/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,12 @@ install(DIRECTORY euslisp test scripts cmake

include(cmake/roseus.cmake)

generate_eusdoc(euslisp/roseus.l "ROS")
generate_eusdoc(euslisp/roseus-utils.l)
generate_eusdoc(euslisp/eustf.l)
generate_eusdoc(euslisp/actionlib.l)
if(NOT DISABLE_DOCUMENTATION)
generate_eusdoc(euslisp/roseus.l "ROS")
generate_eusdoc(euslisp/roseus-utils.l)
generate_eusdoc(euslisp/eustf.l)
generate_eusdoc(euslisp/actionlib.l)
endif()

if(CATKIN_ENABLE_TESTING)
find_package(rostest REQUIRED)
Expand Down
3 changes: 2 additions & 1 deletion roseus/bin/roseus.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ set -e
if [ "@APPLE@" = "1" ]; then
EUSLISP_EXE=/usr/local/bin/irteusgl # osx
else
EUSLISP_EXE=`find -L $EUSDIR -type f -name irteusgl` # linux
EUSLISP_EXE=$(which irteusgl || which irteusg)
fi
if [ ! -e "$EUSLISP_EXE" ]; then echo "Could not found irteusgl program, please install/compile jskeus"; exit 1; fi
ROSEUS_DIR=`rospack find roseus`
ARG_STR=("(pushnew \"${ROSEUS_DIR}/euslisp/\" *load-path* :test #'equal)" \
${ROSEUS_DIR}/euslisp/roseus.l ${ROSEUS_DIR}/euslisp/eustf.l ${ROSEUS_DIR}/euslisp/actionlib.l ${ROSEUS_DIR}/euslisp/roseus-utils.l)
Expand Down