split to two ros packages

ctu-mrs · Sep 16, 2023 · f3495f9 · f3495f9
1 parent 7a33dc1
commit f3495f9
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 28 deletions.
diff --git a/.github/workflows/ros_package_build.yml b/.github/workflows/ros_package_build.yml
@@ -5,9 +5,6 @@ on:
   push:
     branches: [ 1.5 ]
 
-  pull_request:
-    branches: [ 1.5 ]
-
   workflow_dispatch:
 
 concurrency:

diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/README.md b/README.md
@@ -101,10 +101,6 @@ Some of those are forks of third party repositories.
 | [Object detection](https://github.com/ctu-mrs/object_detect)                         | Object detection by color segmentation                                                        | [![Build Status](https://github.com/ctu-mrs/object_detect/workflows/Noetic/badge.svg)](https://github.com/ctu-mrs/object_detect/actions)                             |
 | [MRS utils](https://github.com/ctu-mrs/mrs_utils)                                    | Development utils                                                                             | [![Build Status](https://github.com/ctu-mrs/mrs_utils/workflows/Noetic/badge.svg)](https://github.com/ctu-mrs/mrs_utils/actions)                                     |
 | [OctomapTools](https://github.com/ctu-mrs/octomap_tools)                             | Octomap visualization and manipulation                                                        |                                                                                                                                                                      |
-| [MBZIRC 2020 - Wall Building](https://github.com/ctu-mrs/mbzirc_2020_wall_building)  | System for automatic wall-building for MBZIRC 2020                                            | [![Build Status](https://github.com/ctu-mrs/mbzirc_2020_wall_building/workflows/Noetic/badge.svg)](https://github.com/ctu-mrs/mbzirc_2020_wall_building/actions)     |
-| [Summer School 2019](https://github.com/ctu-mrs/mtsp_planning_task)                  | Summer School 2019 task - MTSP planning                                                       | [![Build Status](https://github.com/ctu-mrs/mtsp_planning_task/workflows/Noetic/badge.svg)](https://github.com/ctu-mrs/mtsp_planning_task/actions)                   |
-| [Summer School 2020](https://github.com/ctu-mrs/leader_follower_task)                | Summer School 2020 task - UVDAR leader-follower                                               | [![Build Status](https://github.com/ctu-mrs/leader_follower_task/workflows/Noetic/badge.svg)](https://github.com/ctu-mrs/leader_follower_task/actions)               |
-| [Summer School 2022](https://github.com/ctu-mrs/summer-school-2022)                  | Summer School 2022 task - Multirobotic inspection and monitoring                              | [![Build Status](https://github.com/ctu-mrs/summer-school-2022/workflows/Focal/badge.svg)](https://github.com/ctu-mrs/leader_follower_task/actions)                  |
 
 ## Backwards compatibility and updates
 

diff --git a/ros_packages/mrs_uav_system/CMakeLists.txt b/ros_packages/mrs_uav_system/CMakeLists.txt
@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 3.5)
+project(mrs_uav_system)
+
+find_package(catkin REQUIRED)
+
+catkin_metapackage()
diff --git a/ros_packages/mrs_uav_system/package.xml b/ros_packages/mrs_uav_system/package.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<package format="2">
+
+  <name>mrs_uav_system</name>
+  <version>1.0.0</version>
+  <description>The MRS UAV System metapackage</description>
+
+  <author email="[email protected]">Tomas Baca</author>
+  <maintainer email="[email protected]">Tomas Baca</maintainer>
+
+  <license>BSD 3-Clause</license>
+
+  <buildtool_depend>catkin</buildtool_depend>
+
+  <exec_depend>mrs_uav_core</exec_depend>
+  <exec_depend>mrs_uav_modules</exec_depend>
+  <exec_depend>python-is-python3</exec_depend>
+
+  <export>
+    <metapackage/>
+  </export>
+
+</package>
diff --git a/ros_packages/mrs_uav_system_full/CMakeLists.txt b/ros_packages/mrs_uav_system_full/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 3.5)
+project(mrs_uav_system_full)
+
+find_package(catkin REQUIRED)
+
+catkin_metapackage()
+
diff --git a/package.xml → ros_packages/mrs_uav_system_full/package.xml b/package.xml → ros_packages/mrs_uav_system_full/package.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <package format="2">
 
-  <name>mrs_uav_system</name>
+  <name>mrs_uav_system_full</name>
   <version>1.0.0</version>
-  <description>The MRS UAV System metapackage</description>
+  <description>The MRS UAV System Full metapackage</description>
 
   <author email="[email protected]">Tomas Baca</author>
   <maintainer email="[email protected]">Tomas Baca</maintainer>
@@ -12,17 +12,17 @@
 
   <buildtool_depend>catkin</buildtool_depend>
 
-  <depend>cmake_modules</depend>
-  <depend>rospy</depend>
-
   <exec_depend>mrs_uav_core</exec_depend>
   <exec_depend>mrs_uav_gazebo_simulation</exec_depend>
   <exec_depend>mrs_uav_deployment</exec_depend>
   <exec_depend>mrs_uav_modules</exec_depend>
+  <exec_depend>mrs_octomap_mapping_planning</exec_depend>
 
   <exec_depend>mrs_uav_px4_api</exec_depend>
   <exec_depend>mrs_uav_dji_tello_api</exec_depend>
 
-  <exec_depend>python-is-python3</exec_depend>
+  <export>
+    <metapackage/>
+  </export>
 
 </package>