From c853222be150a2b0eef5d110a277d57370fad623 Mon Sep 17 00:00:00 2001 From: Martin Magnusson Date: Sun, 22 May 2022 22:24:09 +0200 Subject: [PATCH 1/4] rosinstall and build script to ease working with dependencies --- build.sh | 23 +++++++++++++++++++++ rosinstall | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+) create mode 100755 build.sh create mode 100644 rosinstall diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..4184f5a --- /dev/null +++ b/build.sh @@ -0,0 +1,23 @@ +#!/bin/bash +# source /opt/ros/melodic/setup.bash +# cd acg_ws/src +vcs import < Auto-Complete-Graph/rosinstall +sudo apt update +rosdep install --from-paths src --ignore-src -r -y + +# Stop g2o from complaining about old cmake version +g2o_cmake="libraries/g2o/CMakeLists.txt" +if [ -f $g2o_cmake ] +then + sed -ie '/cmake_minimum_required/s/3.14/3.10/' $g2o_cmake +else + echo -e "\e[31mWhere is $g2o_cmake?\e[0m" +fi + +pushd libraries/BetterGraph && mkdir -p build && cd build && cmake .. && sudo make install +popd +pushd libraries/VoDiGrEx && mkdir -p build && cd build && cmake .. && sudo make install +popd +pushd libraries/g2o && mkdir -p build && cd build && cmake .. && sudo make install +popd +catkin build diff --git a/rosinstall b/rosinstall new file mode 100644 index 0000000..3aee13e --- /dev/null +++ b/rosinstall @@ -0,0 +1,60 @@ +#-*-yaml-*- +repositories: + # non-catkin stuff + libraries/BetterGraph: + type: git + url: https://github.com/MalcolmMielle/BetterGraph.git + version: master + libraries/VoDiGrEx: + type: git + url: https://github.com/MalcolmMielle/VoDiGrEx.git + version: master + libraries/g2o: + type: git + url: https://github.com/RainerKuemmerle/g2o.git + version: master + + + occupancy_grid_utils: + type: git + url: https://github.com/clearpathrobotics/occupancy_grid_utils.git + version: indigo-devel # noetic-devel + octomap: + type: git + url: https://github.com/OctoMap/octomap.git + version: master + velodyne_pointcloud_oru: + type: git + url: https://github.com/dan11003/velodyne_pointcloud_oru.git + version: master + graph_map_public: + type: git + url: https://gitsvn-nt.oru.se/software/graph_map_public.git + version: merging #! + Auto-Complete-Graph: + type: git + url: https://github.com/MalcolmMielle/Auto-Complete-Graph.git + version: master + grid_map: + type: git + url: https://github.com/ANYbotics/grid_map.git + version: melodic-devel + ndt_core_public: + type: git + url: https://gitsvn-nt.oru.se/software/ndt_core_public.git + version: melodic-devel + ndt_tools_public: + type: git + url: https://gitsvn-nt.oru.se/software/ndt_tools_public.git + version: melodic-devel + + +# #Stuff that should be in rosdep +# sudo apt install libopencv-dev +# sudo apt install ros-${ROS_DISTRO}-costmap-2d ros-${ROS_DISTRO}-tf2 ros-${ROS_DISTRO}-tf2-bullet +# sudo apt install ros-${ROS_DISTRO}-velodyne +# sudo apt install ros-${ROS_DISTRO}-filters +# sudo apt install ros-${ROS_DISTRO}-pcl-ros +# sudo apt install ros-${ROS_DISTRO}-tf-conversions + + From 46a60cea5f419e71f24b7a4295f203619286a38a Mon Sep 17 00:00:00 2001 From: Martin Magnusson Date: Mon, 23 May 2022 00:46:18 +0200 Subject: [PATCH 2/4] Fix path in build.sh --- build.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 4184f5a..2f4ca56 100755 --- a/build.sh +++ b/build.sh @@ -1,9 +1,10 @@ #!/bin/bash # source /opt/ros/melodic/setup.bash -# cd acg_ws/src + +# RUN THIS SCRIPT FROM `your-workspace/src/` vcs import < Auto-Complete-Graph/rosinstall sudo apt update -rosdep install --from-paths src --ignore-src -r -y +rosdep install --from-paths . --ignore-src -r -y # Stop g2o from complaining about old cmake version g2o_cmake="libraries/g2o/CMakeLists.txt" @@ -20,4 +21,5 @@ pushd libraries/VoDiGrEx && mkdir -p build && cd build && cmake .. && sudo make popd pushd libraries/g2o && mkdir -p build && cd build && cmake .. && sudo make install popd + catkin build From f3c0f14e93519d0ab729ca636397809f2a0ce0a9 Mon Sep 17 00:00:00 2001 From: Martin Magnusson Date: Mon, 23 May 2022 13:22:30 +0200 Subject: [PATCH 3/4] Removed ACG from rosinstall file --- rosinstall | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rosinstall b/rosinstall index 3aee13e..981226b 100644 --- a/rosinstall +++ b/rosinstall @@ -14,7 +14,7 @@ repositories: url: https://github.com/RainerKuemmerle/g2o.git version: master - + # catkin stuff occupancy_grid_utils: type: git url: https://github.com/clearpathrobotics/occupancy_grid_utils.git @@ -31,10 +31,10 @@ repositories: type: git url: https://gitsvn-nt.oru.se/software/graph_map_public.git version: merging #! - Auto-Complete-Graph: - type: git - url: https://github.com/MalcolmMielle/Auto-Complete-Graph.git - version: master + # Auto-Complete-Graph: + # type: git + # url: https://github.com/MalcolmMielle/Auto-Complete-Graph.git + # version: master grid_map: type: git url: https://github.com/ANYbotics/grid_map.git From 9c9a41548664a9602e6ba2aef913c968a63fb46b Mon Sep 17 00:00:00 2001 From: Malcolm Mielle Date: Tue, 24 May 2022 08:53:36 +0200 Subject: [PATCH 4/4] Remove comments from rosinstall file --- rosinstall | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/rosinstall b/rosinstall index 981226b..6da215a 100644 --- a/rosinstall +++ b/rosinstall @@ -17,7 +17,7 @@ repositories: # catkin stuff occupancy_grid_utils: type: git - url: https://github.com/clearpathrobotics/occupancy_grid_utils.git + url: https://github.com/clearpathrobotics/occupancy_grid_utils.git version: indigo-devel # noetic-devel octomap: type: git @@ -30,14 +30,10 @@ repositories: graph_map_public: type: git url: https://gitsvn-nt.oru.se/software/graph_map_public.git - version: merging #! - # Auto-Complete-Graph: - # type: git - # url: https://github.com/MalcolmMielle/Auto-Complete-Graph.git - # version: master + version: merging grid_map: type: git - url: https://github.com/ANYbotics/grid_map.git + url: https://github.com/ANYbotics/grid_map.git version: melodic-devel ndt_core_public: type: git @@ -45,16 +41,5 @@ repositories: version: melodic-devel ndt_tools_public: type: git - url: https://gitsvn-nt.oru.se/software/ndt_tools_public.git + url: https://gitsvn-nt.oru.se/software/ndt_tools_public.git version: melodic-devel - - -# #Stuff that should be in rosdep -# sudo apt install libopencv-dev -# sudo apt install ros-${ROS_DISTRO}-costmap-2d ros-${ROS_DISTRO}-tf2 ros-${ROS_DISTRO}-tf2-bullet -# sudo apt install ros-${ROS_DISTRO}-velodyne -# sudo apt install ros-${ROS_DISTRO}-filters -# sudo apt install ros-${ROS_DISTRO}-pcl-ros -# sudo apt install ros-${ROS_DISTRO}-tf-conversions - -