From 8939a59d611a44f501685fe3429c6b2803c42718 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Wed, 11 May 2022 23:52:17 +0900 Subject: [PATCH 1/4] bin/roseus: try to find irteusg, if irteusgl is not found --- roseus/bin/roseus.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/roseus/bin/roseus.in b/roseus/bin/roseus.in index 226ac48c7..69c4f3d16 100755 --- a/roseus/bin/roseus.in +++ b/roseus/bin/roseus.in @@ -4,8 +4,14 @@ set -e if [ "@APPLE@" = "1" ]; then EUSLISP_EXE=/usr/local/bin/irteusgl # osx else - EUSLISP_EXE=`find -L $EUSDIR -type f -name irteusgl` # linux + # https://serverfault.com/questions/225798/can-i-make-find-return-non-0-when-no-matching-files-are-found + EUSLISP_EXE=`find -L $EUSDIR/$ARCHDIR -type f -name irteusgl -exec false {} + -print && \ + find -L $EUSDIR/$ARCHDIR -type f -name irteusg -exec false {} + -print && \ + find -L $EUSDIR -type f -name irteusgl -exec false {} + -print && \ + find -L $EUSDIR -type f -name irteusg -exec false {} + -print \ + ` || true # linux 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) From 65268d9e0852055401bf0d30798a50762f787434 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Tue, 24 May 2022 13:06:00 +0900 Subject: [PATCH 2/4] disable doc generation if 'catkin bt -vi --cmake-args -DDISABLE_DOCUMENTATION=1' --- roseus/CMakeLists.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/roseus/CMakeLists.txt b/roseus/CMakeLists.txt index e732689e3..5de1baf90 100644 --- a/roseus/CMakeLists.txt +++ b/roseus/CMakeLists.txt @@ -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) From 7b2e98ea87d8566cb4f243efad1611a49c74d98c Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Mon, 11 Jul 2022 15:33:16 +0900 Subject: [PATCH 3/4] fix log to use irteusg, if irteusgl is not found --- roseus/bin/roseus.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/roseus/bin/roseus.in b/roseus/bin/roseus.in index 69c4f3d16..2e5d9b6d4 100755 --- a/roseus/bin/roseus.in +++ b/roseus/bin/roseus.in @@ -5,11 +5,11 @@ if [ "@APPLE@" = "1" ]; then EUSLISP_EXE=/usr/local/bin/irteusgl # osx else # https://serverfault.com/questions/225798/can-i-make-find-return-non-0-when-no-matching-files-are-found - EUSLISP_EXE=`find -L $EUSDIR/$ARCHDIR -type f -name irteusgl -exec false {} + -print && \ - find -L $EUSDIR/$ARCHDIR -type f -name irteusg -exec false {} + -print && \ - find -L $EUSDIR -type f -name irteusgl -exec false {} + -print && \ - find -L $EUSDIR -type f -name irteusg -exec false {} + -print \ - ` || true # linux + EUSLISP_EXE=`find -L $EUSDIR/$ARCHDIR -type f -name irteusgl | grep .` || \ + `find -L $EUSDIR/$ARCHDIR -type f -name irteusg | grep .` || \ + `find -L $EUSDIR -type f -name irteusgl | grep .` || \ + `find -L $EUSDIR -type f -name irteusg | grep .` || \ + true # linux fi if [ ! -e "$EUSLISP_EXE" ]; then echo "Could not found irteusgl program, please install/compile jskeus"; exit 1; fi ROSEUS_DIR=`rospack find roseus` From f54afd5db98a7aa02221460d525d49fd8a09bc61 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Wed, 13 Jul 2022 19:38:11 +0900 Subject: [PATCH 4/4] on Pepper's PC, logic to find EUSLISP_EXE did not work.. --- roseus/bin/roseus.in | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/roseus/bin/roseus.in b/roseus/bin/roseus.in index 2e5d9b6d4..a3b5e9ff0 100755 --- a/roseus/bin/roseus.in +++ b/roseus/bin/roseus.in @@ -4,12 +4,7 @@ set -e if [ "@APPLE@" = "1" ]; then EUSLISP_EXE=/usr/local/bin/irteusgl # osx else - # https://serverfault.com/questions/225798/can-i-make-find-return-non-0-when-no-matching-files-are-found - EUSLISP_EXE=`find -L $EUSDIR/$ARCHDIR -type f -name irteusgl | grep .` || \ - `find -L $EUSDIR/$ARCHDIR -type f -name irteusg | grep .` || \ - `find -L $EUSDIR -type f -name irteusgl | grep .` || \ - `find -L $EUSDIR -type f -name irteusg | grep .` || \ - true # 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`