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

Tools: Updated ardupilot-ws and dependencies #22630

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
15 changes: 13 additions & 2 deletions Tools/environment_install/install-ROS-ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ fi

heading "${green}Installing rosinstall tools${reset}"

sudo apt install ${PYTHON_V}-rosinstall ${PYTHON_V}-rosinstall-generator ${PYTHON_V}-wstool ${PYTHON_V}-catkin-tools -y
sudo apt install ${PYTHON_V}-rosinstall ${PYTHON_V}-rosinstall-generator ${PYTHON_V}-wstool ${PYTHON_V}-catkin-tools ninja-build stow -y

heading "${green}Installing Ardupilot-ROS workspace${reset}"

Expand All @@ -235,9 +235,17 @@ if maybe_prompt_user "Add ardupilot-ws to your home folder [N/y]?" ; then
catkin init
pushd src
git clone https://github.com/ArduPilot/ardupilot_ros.git
git clone https://github.com/GT-RAIL/robot_pose_publisher.git
popd
sudo apt update
rosdep install --from-paths src --ignore-src --rosdistro=${ROS_DISTRO} -y
wstool init src
Copy link
Collaborator

@Ryanf55 Ryanf55 May 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we be using vcstool?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used wstool in reference to ROS usage.

wstool merge -t src https://raw.githubusercontent.com/cartographer-project/cartographer_ros/master/cartographer_ros.rosinstall
wstool update -t src
bash $ROS_WS_ROOT/src/cartographer/scripts/install_abseil.sh
sudo bash $ROS_WS_ROOT/src/cartographer/scripts/install_proto3.sh
dirs -c && pushd $ROS_WS_ROOT
rosdep update
rosdep install --from-paths src --ignore-src --skip-keys="libabsl-dev" --rosdistro=${ROS_DISTRO} -y
catkin build
popd
else
Expand All @@ -251,6 +259,9 @@ fi

if maybe_prompt_user "Add ardupilot_gazebo to your home folder [N/y]?" ; then
if [ ! -d $AP_GZ_ROOT ]; then
#sudo wget https://packages.osrfoundation.org/gazebo.gpg -O /usr/share/keyrings/pkgs-osrf-archive-keyring.gpg
#echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/pkgs-osrf-archive-keyring.gpg] http://packages.osrfoundation.org/gazebo/ubuntu-stable $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/gazebo-stable.list > /dev/null
#sudo apt-get update
sudo apt install gz-garden rapidjson-dev
mkdir -p $AP_GZ_ROOT/src
pushd $AP_GZ_ROOT/src
Expand Down