jsk-ros-pkg · iory · Jun 13, 2022 · Jun 13, 2022 · Jun 13, 2022 · Jun 13, 2022
diff --git a/eigen_conversions/package.xml b/eigen_conversions/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>eigen_conversions</name>
-  <version>1.12.3</version>
+  <version>1.12.4</version>
   <description>
 
      Conversion functions between:

diff --git a/geometry/package.xml b/geometry/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>geometry</name>
-  <version>1.12.3</version>
+  <version>1.12.4</version>
   <description><p>A metapackage for geometry library suite.</p>
     <p><b>Migration</b>: Since ROS Hydro, tf has been "deprecated" in favor of <a href = "http://wiki.ros.org/tf2">tf2</a>. tf2 is an iteration on tf providing generally the same feature set more efficiently. As well as adding a few new features.<br/>
     As tf2 is a major change the tf API has been maintained in its current form. Since tf2 has a superset of the tf features with a subset of the dependencies the tf implementation has been removed and replaced with calls to tf2 under the hood. This will mean that all users will be compatible with tf2. It is recommended for new work to use tf2 directly as it has a cleaner interface. However tf will continue to be supported for through at least J Turtle.

diff --git a/kdl_conversions/package.xml b/kdl_conversions/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>kdl_conversions</name>
-  <version>1.12.3</version>
+  <version>1.12.4</version>
   <description>
 
      Conversion functions between KDL and geometry_msgs types.

diff --git a/tf_conversions_python3/CHANGELOG.rst → tf_conversions/CHANGELOG.rst b/tf_conversions_python3/CHANGELOG.rst → tf_conversions/CHANGELOG.rst
diff --git a/tf_conversions_python3/CMakeLists.txt → tf_conversions/CMakeLists.txt b/tf_conversions_python3/CMakeLists.txt → tf_conversions/CMakeLists.txt
@@ -1,14 +1,10 @@
 cmake_minimum_required(VERSION 3.0.2)
-project(tf_conversions_python3)
+project(tf_conversions)
 
 find_package(orocos_kdl REQUIRED)
 find_package(catkin REQUIRED geometry_msgs kdl_conversions tf)
 find_package(Eigen3 REQUIRED)
 
-set(Python_ADDITIONAL_VERSIONS 3.6;3.7;3.8) ## https://stackoverflow.com/questions/29245558/how-to-link-with-python3-libs-with-cmake
-find_package(PythonInterp 3 REQUIRED) ## tf_python3 :: use Python3 by default
-find_package(PythonLibs "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
-
 catkin_python_setup()
 
 catkin_package(
@@ -47,16 +43,11 @@ catkin_add_nosetests(test/posemath.py)
 
 endif()
 
-## tf_conversions_python3 :: we can share include, library and executable directories.
-# install(DIRECTORY include/${PROJECT_NAME}/
-#   DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})
 
-# install(TARGETS ${PROJECT_NAME}
-#   ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-#   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-#   RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION})
+install(DIRECTORY include/${PROJECT_NAME}/
+  DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})
 
-## tf_pytyhon3 :: re-set PROJECT_NAME to tf
-set(PROJECT_NAME tf_conversions)
-## tf_pytyhon3 :: re-set CATKIN_PACKAGE_PYTHON_DESTINATION with PROJECT_NAME as tf
-set(CATKIN_PACKAGE_PYTHON_DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages/${PROJECT_NAME})
+install(TARGETS ${PROJECT_NAME}
+  ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+  LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+  RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION})
diff --git a/tf_conversions_python3/conf.py → tf_conversions/conf.py b/tf_conversions_python3/conf.py → tf_conversions/conf.py
diff --git a/...thon3/include/tf_conversions/mainpage.dox → ...sions/include/tf_conversions/mainpage.dox b/...thon3/include/tf_conversions/mainpage.dox → ...sions/include/tf_conversions/mainpage.dox
diff --git a/...python3/include/tf_conversions/tf_eigen.h → ...ersions/include/tf_conversions/tf_eigen.h b/...python3/include/tf_conversions/tf_eigen.h → ...ersions/include/tf_conversions/tf_eigen.h
diff --git a/...s_python3/include/tf_conversions/tf_kdl.h → ...nversions/include/tf_conversions/tf_kdl.h b/...s_python3/include/tf_conversions/tf_kdl.h → ...nversions/include/tf_conversions/tf_kdl.h
diff --git a/tf_conversions_python3/index.rst → tf_conversions/index.rst b/tf_conversions_python3/index.rst → tf_conversions/index.rst
diff --git a/tf_conversions_python3/package.xml → tf_conversions/package.xml b/tf_conversions_python3/package.xml → tf_conversions/package.xml
@@ -1,6 +1,7 @@
 <package>
   <name>tf_conversions_python3</name>
-  <version>1.12.3</version>
+  <version>1.12.4</version>
+
   <description>
 
    This package contains a set of conversion functions to convert
@@ -20,7 +21,6 @@ the next major release cycle (see roadmap).
   <url>http://www.ros.org/wiki/tf_conversions</url>
 
   <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
-  <buildtool_depend>python3-catkin-pkg-modules</buildtool_depend>
 
   <build_depend>eigen</build_depend>
   <build_depend>geometry_msgs</build_depend>

diff --git a/tf_conversions_python3/rosdoc.yaml → tf_conversions/rosdoc.yaml b/tf_conversions_python3/rosdoc.yaml → tf_conversions/rosdoc.yaml
diff --git a/tf_conversions_python3/setup.py → tf_conversions/setup.py b/tf_conversions_python3/setup.py → tf_conversions/setup.py
diff --git a/...ns_python3/src/tf_conversions/__init__.py → ...onversions/src/tf_conversions/__init__.py b/...ns_python3/src/tf_conversions/__init__.py → ...onversions/src/tf_conversions/__init__.py
diff --git a/...ns_python3/src/tf_conversions/posemath.py → ...onversions/src/tf_conversions/posemath.py b/...ns_python3/src/tf_conversions/posemath.py → ...onversions/src/tf_conversions/posemath.py
diff --git a/tf_conversions_python3/src/tf_eigen.cpp → tf_conversions/src/tf_eigen.cpp b/tf_conversions_python3/src/tf_eigen.cpp → tf_conversions/src/tf_eigen.cpp
diff --git a/tf_conversions_python3/src/tf_kdl.cpp → tf_conversions/src/tf_kdl.cpp b/tf_conversions_python3/src/tf_kdl.cpp → tf_conversions/src/tf_kdl.cpp
diff --git a/tf_conversions_python3/test/posemath.py → tf_conversions/test/posemath.py b/tf_conversions_python3/test/posemath.py → tf_conversions/test/posemath.py
diff --git a/...onversions_python3/test/test_eigen_tf.cpp → tf_conversions/test/test_eigen_tf.cpp b/...onversions_python3/test/test_eigen_tf.cpp → tf_conversions/test/test_eigen_tf.cpp
diff --git a/tf_conversions_python3/test/test_kdl_tf.cpp → tf_conversions/test/test_kdl_tf.cpp b/tf_conversions_python3/test/test_kdl_tf.cpp → tf_conversions/test/test_kdl_tf.cpp
diff --git a/tf_python3/package.xml b/tf_python3/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>tf_python3</name>
-  <version>1.12.3</version>
+  <version>1.12.4</version>
   <description>
 
 tf is a package that lets the user keep track of multiple coordinate