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.

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

catkin -> python3 "$(command -v catkin)" #407

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion ros-rosbridge_suite/install.bash
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ then
tue-install-debug "Source pkg found in the workspace, removing it, so the system installed version is used"
tue-install-pipe rm "$TUE_SYSTEM_DIR/src/${pkg}"

tue-install-pipe catkin clean --workspace "${TUE_SYSTEM_DIR}" --orphans
tue-install-pipe python3 "$(command -v catkin)" clean --workspace "${TUE_SYSTEM_DIR}" --orphans
else
tue-install-debug "Source pkg already removed"
fi
Expand Down
6 changes: 3 additions & 3 deletions tue-documentation/setup
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ function tue-make-documentation
fi
case $build_tool in
'catkin build')
catkin document --workspace "$TUE_SYSTEM_DIR" "$@"
python3 "$(command -v catkin)" document --workspace "$TUE_SYSTEM_DIR" "$@"
;;
'')
catkin config --init --mkdirs --workspace "$TUE_SYSTEM_DIR" --extend /opt/ros/"$TUE_ROS_DISTRO" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCATKIN_ENABLE_TESTING=OFF
catkin document --workspace "$TUE_SYSTEM_DIR" "$@"
python3 "$(command -v catkin)" config --init --mkdirs --workspace "$TUE_SYSTEM_DIR" --extend /opt/ros/"$TUE_ROS_DISTRO" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCATKIN_ENABLE_TESTING=OFF
python3 "$(command -v catkin)" document --workspace "$TUE_SYSTEM_DIR" "$@"
touch "$TUE_SYSTEM_DIR"/devel/.catkin # hack to allow overlaying to this ws while being empty
;;
*)
Expand Down
4 changes: 2 additions & 2 deletions vscode/install.bash
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ else
fi

# Install and configure catkin tools extension
if ! catkin config --workspace "$TUE_SYSTEM_DIR" | grep -q "DCMAKE_EXPORT_COMPILE_COMMANDS"
if ! python3 "$(command -v catkin)" config --workspace "$TUE_SYSTEM_DIR" | grep -q "DCMAKE_EXPORT_COMPILE_COMMANDS"
then
catkin config --workspace "$TUE_SYSTEM_DIR" --append-args -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
python3 "$(command -v catkin)" config --workspace "$TUE_SYSTEM_DIR" --append-args -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
fi

# Configure to build only active package
Expand Down