diff --git a/eigen_conversions/package.xml b/eigen_conversions/package.xml index 364f0985..7fb687bd 100644 --- a/eigen_conversions/package.xml +++ b/eigen_conversions/package.xml @@ -1,6 +1,6 @@ eigen_conversions - 1.12.3 + 1.12.4 Conversion functions between: diff --git a/geometry/package.xml b/geometry/package.xml index 1779276f..173f38fb 100644 --- a/geometry/package.xml +++ b/geometry/package.xml @@ -1,6 +1,6 @@ geometry - 1.12.3 + 1.12.4

A metapackage for geometry library suite.

Migration: Since ROS Hydro, tf has been "deprecated" in favor of tf2. tf2 is an iteration on tf providing generally the same feature set more efficiently. As well as adding a few new features.
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 index ec283aaf..cc02354a 100644 --- a/kdl_conversions/package.xml +++ b/kdl_conversions/package.xml @@ -1,6 +1,6 @@ kdl_conversions - 1.12.3 + 1.12.4 Conversion functions between KDL and geometry_msgs types. diff --git a/tf_conversions_python3/CHANGELOG.rst b/tf_conversions/CHANGELOG.rst similarity index 100% rename from tf_conversions_python3/CHANGELOG.rst rename to tf_conversions/CHANGELOG.rst diff --git a/tf_conversions_python3/CMakeLists.txt b/tf_conversions/CMakeLists.txt similarity index 55% rename from tf_conversions_python3/CMakeLists.txt rename to tf_conversions/CMakeLists.txt index 1f39c45f..eb2c1c25 100644 --- a/tf_conversions_python3/CMakeLists.txt +++ b/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 b/tf_conversions/conf.py similarity index 100% rename from tf_conversions_python3/conf.py rename to tf_conversions/conf.py diff --git a/tf_conversions_python3/include/tf_conversions/mainpage.dox b/tf_conversions/include/tf_conversions/mainpage.dox similarity index 100% rename from tf_conversions_python3/include/tf_conversions/mainpage.dox rename to tf_conversions/include/tf_conversions/mainpage.dox diff --git a/tf_conversions_python3/include/tf_conversions/tf_eigen.h b/tf_conversions/include/tf_conversions/tf_eigen.h similarity index 100% rename from tf_conversions_python3/include/tf_conversions/tf_eigen.h rename to tf_conversions/include/tf_conversions/tf_eigen.h diff --git a/tf_conversions_python3/include/tf_conversions/tf_kdl.h b/tf_conversions/include/tf_conversions/tf_kdl.h similarity index 100% rename from tf_conversions_python3/include/tf_conversions/tf_kdl.h rename to tf_conversions/include/tf_conversions/tf_kdl.h diff --git a/tf_conversions_python3/index.rst b/tf_conversions/index.rst similarity index 100% rename from tf_conversions_python3/index.rst rename to tf_conversions/index.rst diff --git a/tf_conversions_python3/package.xml b/tf_conversions/package.xml similarity index 93% rename from tf_conversions_python3/package.xml rename to tf_conversions/package.xml index d590286e..e0a77ce4 100644 --- a/tf_conversions_python3/package.xml +++ b/tf_conversions/package.xml @@ -1,6 +1,7 @@ tf_conversions_python3 - 1.12.3 + 1.12.4 + This package contains a set of conversion functions to convert @@ -20,7 +21,6 @@ the next major release cycle (see roadmap). http://www.ros.org/wiki/tf_conversions catkin - python3-catkin-pkg-modules eigen geometry_msgs diff --git a/tf_conversions_python3/rosdoc.yaml b/tf_conversions/rosdoc.yaml similarity index 100% rename from tf_conversions_python3/rosdoc.yaml rename to tf_conversions/rosdoc.yaml diff --git a/tf_conversions_python3/setup.py b/tf_conversions/setup.py similarity index 100% rename from tf_conversions_python3/setup.py rename to tf_conversions/setup.py diff --git a/tf_conversions_python3/src/tf_conversions/__init__.py b/tf_conversions/src/tf_conversions/__init__.py similarity index 100% rename from tf_conversions_python3/src/tf_conversions/__init__.py rename to tf_conversions/src/tf_conversions/__init__.py diff --git a/tf_conversions_python3/src/tf_conversions/posemath.py b/tf_conversions/src/tf_conversions/posemath.py similarity index 100% rename from tf_conversions_python3/src/tf_conversions/posemath.py rename to tf_conversions/src/tf_conversions/posemath.py diff --git a/tf_conversions_python3/src/tf_eigen.cpp b/tf_conversions/src/tf_eigen.cpp similarity index 100% rename from tf_conversions_python3/src/tf_eigen.cpp rename to tf_conversions/src/tf_eigen.cpp diff --git a/tf_conversions_python3/src/tf_kdl.cpp b/tf_conversions/src/tf_kdl.cpp similarity index 100% rename from tf_conversions_python3/src/tf_kdl.cpp rename to tf_conversions/src/tf_kdl.cpp diff --git a/tf_conversions_python3/test/posemath.py b/tf_conversions/test/posemath.py similarity index 100% rename from tf_conversions_python3/test/posemath.py rename to tf_conversions/test/posemath.py diff --git a/tf_conversions_python3/test/test_eigen_tf.cpp b/tf_conversions/test/test_eigen_tf.cpp similarity index 100% rename from tf_conversions_python3/test/test_eigen_tf.cpp rename to tf_conversions/test/test_eigen_tf.cpp diff --git a/tf_conversions_python3/test/test_kdl_tf.cpp b/tf_conversions/test/test_kdl_tf.cpp similarity index 100% rename from tf_conversions_python3/test/test_kdl_tf.cpp rename to tf_conversions/test/test_kdl_tf.cpp diff --git a/tf_python3/package.xml b/tf_python3/package.xml index 8ed2b975..95fd4ffe 100644 --- a/tf_python3/package.xml +++ b/tf_python3/package.xml @@ -1,6 +1,6 @@ tf_python3 - 1.12.3 + 1.12.4 tf is a package that lets the user keep track of multiple coordinate