From 9b1900889b0ab873e180c08430d2133a1230313c Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Fri, 16 Dec 2022 19:36:14 +1000 Subject: [PATCH 1/3] export RMW_IMPLEMENTATION for osx due to https://github.com/RoboStack/ros-humble/issues/32 --- vinca/templates/activate.sh.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vinca/templates/activate.sh.in b/vinca/templates/activate.sh.in index 4a35f58..0e757d5 100644 --- a/vinca/templates/activate.sh.in +++ b/vinca/templates/activate.sh.in @@ -22,5 +22,9 @@ esac export ROS_ETC_DIR=$CONDA_PREFIX/etc/ros export AMENT_PREFIX_PATH=$CONDA_PREFIX +if [ "$OSTYPE" = "darwin*" ]; then + export RMW_IMPLEMENTATION="rmw_cyclonedds_cpp" +fi + # Looks unnecessary for UNIX # unset PYTHONHOME= From 6e450c14bd5158d8d595f8703e31d49e11d39ad3 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Fri, 16 Dec 2022 19:36:58 +1000 Subject: [PATCH 2/3] unset RMW_IMPLEMENTATION --- vinca/templates/deactivate.sh.in | 1 + 1 file changed, 1 insertion(+) diff --git a/vinca/templates/deactivate.sh.in b/vinca/templates/deactivate.sh.in index 98957c6..87d4d83 100644 --- a/vinca/templates/deactivate.sh.in +++ b/vinca/templates/deactivate.sh.in @@ -18,3 +18,4 @@ unset ROS_OS_OVERRIDE # unset QT_PLUGIN_PATH unset ROS_LOCALHOST_ONLY unset ament_python_executable +unset RMW_IMPLEMENTATION From 363e7f03b4ba11224cca5ed2c3a301c81a1bfd18 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Fri, 16 Dec 2022 20:01:11 +1000 Subject: [PATCH 3/3] Update activate.sh.in --- vinca/templates/activate.sh.in | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/vinca/templates/activate.sh.in b/vinca/templates/activate.sh.in index 0e757d5..aece970 100644 --- a/vinca/templates/activate.sh.in +++ b/vinca/templates/activate.sh.in @@ -15,16 +15,12 @@ else fi case "$OSTYPE" in - darwin*) export ROS_OS_OVERRIDE="conda:osx";; + darwin*) export ROS_OS_OVERRIDE="conda:osx"; export RMW_IMPLEMENTATION="rmw_cyclonedds_cpp";; linux*) export ROS_OS_OVERRIDE="conda:linux";; esac export ROS_ETC_DIR=$CONDA_PREFIX/etc/ros export AMENT_PREFIX_PATH=$CONDA_PREFIX -if [ "$OSTYPE" = "darwin*" ]; then - export RMW_IMPLEMENTATION="rmw_cyclonedds_cpp" -fi - # Looks unnecessary for UNIX # unset PYTHONHOME=