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

Add ROS_ETC_DIR and AMENT_PREFIX_PATH to activate scripts (ros2) #13

Merged
merged 7 commits into from
Jul 20, 2021
Merged

Add ROS_ETC_DIR and AMENT_PREFIX_PATH to activate scripts (ros2) #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ba09573
Add ROS_ETC_DIR to activate.bat
Tobias-Fischer Jul 20, 2021
af19bcc
Add ROS_ETC_DIR (unix platforms)
Tobias-Fischer Jul 20, 2021
564eb5e
Set AMENT_PREFIX_PATH (win)
Tobias-Fischer Jul 20, 2021
9a33e46
Set AMENT_PREFIX_PATH (Unix)
Tobias-Fischer Jul 20, 2021
667c610
Fix url
Tobias-Fischer Jul 20, 2021
2e32644
Fix url
Tobias-Fischer Jul 20, 2021
8046412
Fix URL
Tobias-Fischer Jul 20, 2021
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
3 changes: 2 additions & 1 deletion vinca/templates/activate.bat.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@
@@call "%CONDA_PREFIX%\Library\local_setup.bat"
@@set PYTHONHOME=
@@set "ROS_OS_OVERRIDE=robostack:win64"

@@set "ROS_ETC_DIR=%CONDA_PREFIX%\Library\etc\ros"
@@set "AMENT_PREFIX_PATH=%CONDA_PREFIX%\Library"
5 changes: 4 additions & 1 deletion vinca/templates/activate.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by vinca http://github.com/seanyen/vinca.
# Generated by vinca http://github.com/RoboStack/vinca.
# DO NOT EDIT!
# if [ -z "${CONDA_PREFIX}" ]; then
# exit 0;
Expand All @@ -19,5 +19,8 @@ case "$OSTYPE" in
linux*) export ROS_OS_OVERRIDE="robostack:linux";;
esac

export ROS_ETC_DIR=$CONDA_PREFIX/etc/ros
export AMENT_PREFIX_PATH=$CONDA_PREFIX

# Looks unnecessary for UNIX
# unset PYTHONHOME=
2 changes: 1 addition & 1 deletion vinca/templates/build_catkin.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by vinca http://github.com/seanyen/vinca.
# Generated by vinca http://github.com/RoboStack/vinca.
# DO NOT EDIT!

CATKIN_BUILD_BINARY_PACKAGE="ON"
Expand Down
2 changes: 1 addition & 1 deletion vinca/templates/deactivate.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by vinca http://github.com/seanyen/vinca.
# Generated by vinca http://github.com/RoboStack/vinca.
# DO NOT EDIT!
if [ -z "${CONDA_PREFIX}" ]; then
exit 0
Expand Down