From fee074360487f55e4f54eed1da954de70212363e Mon Sep 17 00:00:00 2001
From: Hriday Bavle <hriday.bavle@gmail.com>
Date: Thu, 27 Jun 2024 16:37:05 +0200
Subject: [PATCH] [Feat] Add packages using vcs

---
 .github/workflows/setup.sh |  5 ++++-
 .gitignore                 |  3 ++-
 .rosinstall_ros2           | 22 +++++++++++++---------
 setup.sh                   |  4 ++--
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/setup.sh b/.github/workflows/setup.sh
index dd5cb48..7bb78b7 100755
--- a/.github/workflows/setup.sh
+++ b/.github/workflows/setup.sh
@@ -6,8 +6,11 @@ DEBIAN_FRONTEND=noninteractive sudo apt install -y libceres-dev python3-pip
 #rosdep init
 rosdep update --include-eol-distros
 
+#install vcs-tools
+DEBIAN_FRONTEND=noninteractive sudo apt install python3-vcstool
+
 #import all repos
-git submodule update --init --recursive
+vcs import . < .rosinstall_ros2
 
 #rosdep install
 DEBIAN_FRONTEND=noninteractive rosdep install --from-paths . -y --ignore-src -r
diff --git a/.gitignore b/.gitignore
index d1e046b..d8560f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,8 @@ imgui.ini
 # - IDEs Folder
 build/
 install/
-log
+log/
+utils/
 
 # - Clangd
 compile_commands.json
diff --git a/.rosinstall_ros2 b/.rosinstall_ros2
index 1a14cd4..566a64f 100644
--- a/.rosinstall_ros2
+++ b/.rosinstall_ros2
@@ -1,25 +1,29 @@
 repositories:
-  s_graphs_utils/fast_gicp:
+  utils/fast_gicp:
     type: git
     url: https://github.com/SMRT-AIST/fast_gicp.git
     version: master
-  s_graphs_utils/ndt_omp:
+  utils/ndt_omp:
     type: git
     url: https://github.com/koide3/ndt_omp.git
     version: master
-  s_graphs_utils/reasoning/situational_graphs_reasoning:
+  utils/reasoning/situational_graphs_reasoning:
     type: git
     url: https://github.com/snt-arg/situational_graphs_reasoning.git
-    version: complete_gnn_architecture
-  s_graphs_utils/reasoning/situational_graphs_datasets:
+    version: develop
+  utils/reasoning/situational_graphs_datasets:
     type: git
     url: https://github.com/snt-arg/situational_graphs_datasets.git
-    version: graph_reasoning
-  s_graphs_utils/msgs/situational_graphs_reasoning_msgs:
+    version: develop
+  utils/reasoning/situational_graphs_wrapper:
+    type: git
+    url: https://github.com/snt-arg/situational_graphs_wrapper.git
+    version: develop
+  utils/msgs/situational_graphs_reasoning_msgs:
     type: git
     url: https://github.com/snt-arg/situational_graphs_reasoning_msgs.git
     version: main
-  s_graphs_utils/msgs/situational_graphs_msgs:
+  utils/msgs/situational_graphs_msgs:
     type: git
     url: https://github.com/snt-arg/situational_graphs_msgs.git
-    version: main  
+    version: main
\ No newline at end of file
diff --git a/setup.sh b/setup.sh
index 0771131..d0e6492 100755
--- a/setup.sh
+++ b/setup.sh
@@ -18,7 +18,7 @@ pip install protobuf==3.20.*
 rosdep update --include-eol-distros
 
 #import all repos
-git submodule update --init --recursive
+vcs import . < .rosinstall_ros2
 
 #install python requirements
 pip3 install -r requirements.txt
@@ -27,7 +27,7 @@ pip3 install -r requirements.txt
 rosdep install --from-paths . -y --ignore-src -r
 
 # - Importing all dependencies
-colcon build --symlink-install 
+colcon build --symlink-install
 
 # - Sourcing the workspace
 source install/setup.bash
\ No newline at end of file