Package ROS2 along ROS1

jrl-umi3218 · Feb 15, 2024 · 8a07df4 · 8a07df4
1 parent 15f4a75
commit 8a07df4
Show file tree

Hide file tree

Showing 461 changed files with 23 additions and 132,911 deletions.
diff --git a/.github/workflows/conan.yml b/.github/workflows/conan.yml
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -20,10 +20,11 @@ jobs:
   package:
     uses: jrl-umi3218/github-actions/.github/workflows/package-project.yml@master
     with:
+      main-repo: jrl-umi3218/mc_rtc_data
       with-ros: true
       matrix: |
         {
-          "dist": ["bionic", "focal"],
+          "dist": ["bionic", "focal", "jammy"],
           "arch": ["amd64"]
         }
     secrets:

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,9 @@
+[submodule "jvrc_description"]
+	path = jvrc_description
+	url = https://github.com/jrl-umi3218/jvrc_description
+[submodule "mc_env_description"]
+	path = mc_env_description
+	url = https://github.com/jrl-umi3218/mc_env_description
+[submodule "mc_int_obj_description"]
+	path = mc_int_obj_description
+	url = https://github.com/jrl-umi3218/mc_int_obj_description
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,6 +9,11 @@ enable_testing()
 
 if(DISABLE_ROS)
   message(STATUS "Building without ROS support as DISABLE_ROS=ON")
+else()
+  if(NOT DEFINED ENV{ROS_VERSION})
+    message(FATAL_ERROR "ROS_VERSION is not set in the environment")
+  endif()
+  set(ROS_VERSION $ENV{ROS_VERSION})
 endif()
 
 add_subdirectory(jvrc_description)

diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
diff --git a/cmake/ConfigVersion.cmake.in b/cmake/ConfigVersion.cmake.in
diff --git a/conan/CMakeLists.txt b/conan/CMakeLists.txt
diff --git a/conan/test_package/CMakeLists.txt b/conan/test_package/CMakeLists.txt
diff --git a/conan/test_package/conanfile.py b/conan/test_package/conanfile.py
diff --git a/conan/test_package/example.cpp b/conan/test_package/example.cpp
diff --git a/conanfile.py b/conanfile.py
diff --git a/debian/control b/debian/control
@@ -7,6 +7,7 @@ Homepage: https://github.com/jrl-umi3218/mc_rtc_data
 Vcs-git: https://github.com/jrl-umi3218/mc_rtc_data
 Vcs-Browser: https://github.com/jrl-umi3218/mc_rtc_data
 Build-Depends: debhelper (>= 9),
+#ROS2           ros-@ROS_DISTRO@-ament-cmake,
                cmake
 
 Package: mc-rtc-data

diff --git a/debian/rules b/debian/rules
@@ -9,5 +9,8 @@ TMP = $(CURDIR)/debian/tmp
 %:
 	dh $@
 
+override_dh_auto_configure:
+	dh_auto_configure -- -DDISABLE_ROS=ON
+
 override_dh_auto_install:
 	dh_auto_install --destdir=$(TMP)
diff --git a/jvrc_description b/jvrc_description
diff --git a/jvrc_description/CMakeLists.txt b/jvrc_description/CMakeLists.txt
diff --git a/jvrc_description/LICENSE b/jvrc_description/LICENSE
diff --git a/jvrc_description/README.md b/jvrc_description/README.md
diff --git a/jvrc_description/calib/jvrc1/calib_data.LeftFootForceSensor b/jvrc_description/calib/jvrc1/calib_data.LeftFootForceSensor
diff --git a/jvrc_description/calib/jvrc1/calib_data.LeftHandForceSensor b/jvrc_description/calib/jvrc1/calib_data.LeftHandForceSensor
diff --git a/jvrc_description/calib/jvrc1/calib_data.RightFootForceSensor b/jvrc_description/calib/jvrc1/calib_data.RightFootForceSensor
diff --git a/jvrc_description/calib/jvrc1/calib_data.RightHandForceSensor b/jvrc_description/calib/jvrc1/calib_data.RightHandForceSensor