From a7ecfb8ccc185e4682706b5dd8d915141f61baf8 Mon Sep 17 00:00:00 2001
From: Jennifer Buehler <jenniferb@cse.unsw.edu.au>
Date: Mon, 6 Jun 2016 14:34:02 +0200
Subject: [PATCH] Cleaned up cmake/package files and added changelogs
---
object_msgs/CHANGELOG.rst | 8 +++
object_msgs/CMakeLists.txt | 9 ----
object_msgs/package.xml | 19 ++-----
object_msgs_tools/CHANGELOG.rst | 8 +++
object_msgs_tools/CMakeLists.txt | 78 -----------------------------
object_msgs_tools/package.xml | 15 +-----
path_navigation_msgs/CHANGELOG.rst | 8 +++
path_navigation_msgs/CMakeLists.txt | 50 ++----------------
path_navigation_msgs/package.xml | 17 ++-----
9 files changed, 34 insertions(+), 178 deletions(-)
create mode 100644 object_msgs/CHANGELOG.rst
create mode 100644 object_msgs_tools/CHANGELOG.rst
create mode 100644 path_navigation_msgs/CHANGELOG.rst
diff --git a/object_msgs/CHANGELOG.rst b/object_msgs/CHANGELOG.rst
new file mode 100644
index 0000000..d668d67
--- /dev/null
+++ b/object_msgs/CHANGELOG.rst
@@ -0,0 +1,8 @@
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Changelog for package object_msgs
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Forthcoming
+-----------
+* Initial release
+* Contributors: Jennifer Buehler
diff --git a/object_msgs/CMakeLists.txt b/object_msgs/CMakeLists.txt
index 73ffafe..0fa249a 100644
--- a/object_msgs/CMakeLists.txt
+++ b/object_msgs/CMakeLists.txt
@@ -12,15 +12,6 @@ find_package(catkin REQUIRED COMPONENTS
message_generation
)
-## System dependencies are found with CMake's conventions
-# find_package(Boost REQUIRED COMPONENTS system)
-
-
-## Uncomment this if the package has a setup.py. This macro ensures
-## modules and global scripts declared therein get installed
-## See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html
-# catkin_python_setup()
-
################################################
## Declare ROS messages, services and actions ##
################################################
diff --git a/object_msgs/package.xml b/object_msgs/package.xml
index 30915da..bef538a 100644
--- a/object_msgs/package.xml
+++ b/object_msgs/package.xml
@@ -12,16 +12,13 @@
</description>
<!-- One maintainer tag required, multiple allowed, one person per tag -->
- <!-- Example: -->
<maintainer email="jennifer.e.buehler@gmail.com">Jennifer Buehler</maintainer>
-
<!-- One license tag required, multiple allowed, one license per tag -->
<!-- Commonly used license strings: -->
<!-- BSD, MIT, Boost Software License, GPLv2, GPLv3, LGPLv2.1, LGPLv3 -->
<license>LPGv3</license>
-
<!-- Url tags are optional, but mutiple are allowed, one per tag -->
<!-- Optional attribute type can be: website, bugtracker, or repository -->
<!-- Example: -->
@@ -30,37 +27,27 @@
<!-- Author tags are optional, mutiple are allowed, one per tag -->
<!-- Authors do not have to be maintianers, but could be -->
- <!-- Example: -->
- <!-- <author email="jane.doe@example.com">Jane Doe</author> -->
+ <author email="jennifer.e.buehler@gmail.com">Jennifer Buehler</author>
<!-- The *_depend tags are used to specify dependencies -->
<!-- Dependencies can be catkin packages or system dependencies -->
- <!-- Examples: -->
- <!-- Use build_depend for packages you need at compile time: -->
- <build_depend>message_generation</build_depend>
- <!-- Use buildtool_depend for build tool packages: -->
- <!-- <buildtool_depend>catkin</buildtool_depend> -->
- <!-- Use run_depend for packages you need at runtime: -->
- <run_depend>message_runtime</run_depend>
- <!-- Use test_depend for packages you need only for testing: -->
- <!-- <test_depend>gtest</test_depend> -->
<buildtool_depend>catkin</buildtool_depend>
+ <build_depend>message_generation</build_depend>
<build_depend>geometry_msgs</build_depend>
<build_depend>shape_msgs</build_depend>
<build_depend>std_msgs</build_depend>
<build_depend>object_recognition_msgs</build_depend>
+ <run_depend>message_runtime</run_depend>
<run_depend>geometry_msgs</run_depend>
<run_depend>shape_msgs</run_depend>
<run_depend>std_msgs</run_depend>
<run_depend>object_recognition_msgs</run_depend>
-
<!-- The export tag contains other, unspecified, tags -->
<export>
<!-- You can specify that this package is a metapackage here: -->
<!-- <metapackage/> -->
-
<!-- Other tools can request additional information be placed here -->
</export>
</package>
diff --git a/object_msgs_tools/CHANGELOG.rst b/object_msgs_tools/CHANGELOG.rst
new file mode 100644
index 0000000..1f0fa9c
--- /dev/null
+++ b/object_msgs_tools/CHANGELOG.rst
@@ -0,0 +1,8 @@
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Changelog for package object_msgs_tools
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Forthcoming
+-----------
+* Initial release
+* Contributors: Jennifer Buehler
diff --git a/object_msgs_tools/CMakeLists.txt b/object_msgs_tools/CMakeLists.txt
index fa5f7b1..b311bbe 100644
--- a/object_msgs_tools/CMakeLists.txt
+++ b/object_msgs_tools/CMakeLists.txt
@@ -11,66 +11,6 @@ find_package(catkin REQUIRED COMPONENTS
tf
)
-## System dependencies are found with CMake's conventions
-# find_package(Boost REQUIRED COMPONENTS system)
-
-
-## Uncomment this if the package has a setup.py. This macro ensures
-## modules and global scripts declared therein get installed
-## See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html
-# catkin_python_setup()
-
-################################################
-## Declare ROS messages, services and actions ##
-################################################
-
-## To declare and build messages, services or actions from within this
-## package, follow these steps:
-## * Let MSG_DEP_SET be the set of packages whose message types you use in
-## your messages/services/actions (e.g. std_msgs, actionlib_msgs, ...).
-## * In the file package.xml:
-## * add a build_depend tag for "message_generation"
-## * add a build_depend and a run_depend tag for each package in MSG_DEP_SET
-## * If MSG_DEP_SET isn't empty the following dependency has been pulled in
-## but can be declared for certainty nonetheless:
-## * add a run_depend tag for "message_runtime"
-## * In this file (CMakeLists.txt):
-## * add "message_generation" and every package in MSG_DEP_SET to
-## find_package(catkin REQUIRED COMPONENTS ...)
-## * add "message_runtime" and every package in MSG_DEP_SET to
-## catkin_package(CATKIN_DEPENDS ...)
-## * uncomment the add_*_files sections below as needed
-## and list every .msg/.srv/.action file to be processed
-## * uncomment the generate_messages entry below
-## * add every package in MSG_DEP_SET to generate_messages(DEPENDENCIES ...)
-
-## Generate messages in the 'msg' folder
-# add_message_files(
-# FILES
-# Message1.msg
-# Message2.msg
-# )
-
-## Generate services in the 'srv' folder
-# add_service_files(
-# FILES
-# Service1.srv
-# Service2.srv
-# )
-
-## Generate actions in the 'action' folder
-# add_action_files(
-# FILES
-# Action1.action
-# Action2.action
-# )
-
-## Generate added messages and services with any dependencies listed here
-# generate_messages(
-# DEPENDENCIES
-# object_msgs
-# )
-
################################################
## Declare ROS dynamic reconfigure parameters ##
################################################
@@ -157,13 +97,6 @@ target_link_libraries(register_object_client
# all install targets should use catkin DESTINATION variables
# See http://ros.org/doc/api/catkin/html/adv_user_guide/variables.html
-## Mark executable scripts (Python etc.) for installation
-## in contrast to setup.py, you can choose the destination
-# install(PROGRAMS
-# scripts/my_python_script
-# DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
-# )
-
## Mark executables and/or libraries for installation
install(TARGETS object_msgs_tools object_tf_broadcaster_node register_object_client
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
@@ -175,24 +108,13 @@ install(TARGETS object_msgs_tools object_tf_broadcaster_node register_object_cli
install(DIRECTORY include/${PROJECT_NAME}/
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
FILES_MATCHING PATTERN "*.h"
- PATTERN ".git" EXCLUDE
)
install(DIRECTORY launch/
DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
FILES_MATCHING PATTERN "*.launch"
- PATTERN ".git" EXCLUDE
)
-
-
-## Mark other files for installation (e.g. launch and bag files, etc.)
-# install(FILES
-# # myfile1
-# # myfile2
-# DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
-# )
-
#############
## Testing ##
#############
diff --git a/object_msgs_tools/package.xml b/object_msgs_tools/package.xml
index 038e84a..30dffd9 100644
--- a/object_msgs_tools/package.xml
+++ b/object_msgs_tools/package.xml
@@ -7,7 +7,6 @@
<!-- One maintainer tag required, multiple allowed, one person per tag -->
<maintainer email="jennifer.e.buehler@gmail.com">Jennifer Buehler</maintainer>
-
<!-- One license tag required, multiple allowed, one license per tag -->
<!-- Commonly used license strings: -->
<!-- BSD, MIT, Boost Software License, GPLv2, GPLv3, LGPLv2.1, LGPLv3 -->
@@ -22,21 +21,11 @@
<!-- Author tags are optional, mutiple are allowed, one per tag -->
<!-- Authors do not have to be maintianers, but could be -->
- <!-- Example: -->
- <!-- <author email="jane.doe@example.com">Jane Doe</author> -->
+ <author email="jennifer.e.buehler@gmail.com">Jennifer Buehler</author>
<!-- The *_depend tags are used to specify dependencies -->
<!-- Dependencies can be catkin packages or system dependencies -->
- <!-- Examples: -->
- <!-- Use build_depend for packages you need at compile time: -->
- <!-- <build_depend>message_generation</build_depend> -->
- <!-- Use buildtool_depend for build tool packages: -->
- <!-- <buildtool_depend>catkin</buildtool_depend> -->
- <!-- Use run_depend for packages you need at runtime: -->
- <!-- <run_depend>message_runtime</run_depend> -->
- <!-- Use test_depend for packages you need only for testing: -->
- <!-- <test_depend>gtest</test_depend> -->
<buildtool_depend>catkin</buildtool_depend>
<build_depend>object_msgs</build_depend>
<build_depend>roscpp</build_depend>
@@ -47,10 +36,8 @@
<run_depend>eigen_conversions</run_depend>
<run_depend>tf</run_depend>
-
<!-- The export tag contains other, unspecified, tags -->
<export>
<!-- Other tools can request additional information be placed here -->
-
</export>
</package>
diff --git a/path_navigation_msgs/CHANGELOG.rst b/path_navigation_msgs/CHANGELOG.rst
new file mode 100644
index 0000000..1fd0821
--- /dev/null
+++ b/path_navigation_msgs/CHANGELOG.rst
@@ -0,0 +1,8 @@
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Changelog for package path_navigation_msgs
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Forthcoming
+-----------
+* Initial release
+* Contributors: Jennifer Buehler
diff --git a/path_navigation_msgs/CMakeLists.txt b/path_navigation_msgs/CMakeLists.txt
index 7ec435f..5b9e554 100644
--- a/path_navigation_msgs/CMakeLists.txt
+++ b/path_navigation_msgs/CMakeLists.txt
@@ -13,54 +13,10 @@ find_package(catkin REQUIRED COMPONENTS
message_generation
)
-## System dependencies are found with CMake's conventions
-# find_package(Boost REQUIRED COMPONENTS system)
-
-
-## Uncomment this if the package has a setup.py. This macro ensures
-## modules and global scripts declared therein get installed
-## See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html
-# catkin_python_setup()
-
################################################
## Declare ROS messages, services and actions ##
################################################
-## To declare and build messages, services or actions from within this
-## package, follow these steps:
-## * Let MSG_DEP_SET be the set of packages whose message types you use in
-## your messages/services/actions (e.g. std_msgs, actionlib_msgs, ...).
-## * In the file package.xml:
-## * add a build_depend and a run_depend tag for each package in MSG_DEP_SET
-## * If MSG_DEP_SET isn't empty the following dependencies might have been
-## pulled in transitively but can be declared for certainty nonetheless:
-## * add a build_depend tag for "message_generation"
-## * add a run_depend tag for "message_runtime"
-## * In this file (CMakeLists.txt):
-## * add "message_generation" and every package in MSG_DEP_SET to
-## find_package(catkin REQUIRED COMPONENTS ...)
-## * add "message_runtime" and every package in MSG_DEP_SET to
-## catkin_package(CATKIN_DEPENDS ...)
-## * uncomment the add_*_files sections below as needed
-## and list every .msg/.srv/.action file to be processed
-## * uncomment the generate_messages entry below
-## * add every package in MSG_DEP_SET to generate_messages(DEPENDENCIES ...)
-
-## Generate messages in the 'msg' folder
-# add_message_files(
-# FILES
-# Message1.msg
-# Message2.msg
-# )
-
-## Generate services in the 'srv' folder
-# add_service_files(
-# FILES
-# Service1.srv
-# Service2.srv
-# )
-
-
## Generate actions in the 'action' folder
add_action_files(
FILES
@@ -98,9 +54,9 @@ catkin_package(
## Specify additional locations of header files
## Your package locations should be listed before other locations
# include_directories(include)
-include_directories(
- ${catkin_INCLUDE_DIRS}
-)
+#include_directories(
+# ${catkin_INCLUDE_DIRS}
+#)
## Declare a cpp library
# add_library(path_navigation_msgs
diff --git a/path_navigation_msgs/package.xml b/path_navigation_msgs/package.xml
index e8fb162..4439b87 100644
--- a/path_navigation_msgs/package.xml
+++ b/path_navigation_msgs/package.xml
@@ -16,37 +16,26 @@
<!-- Example: -->
<!-- <url type="website">http://wiki.ros.org/path_navigation_msgs</url> -->
-
<!-- Author tags are optional, mutiple are allowed, one per tag -->
<!-- Authors do not have to be maintianers, but could be -->
- <!-- Example: -->
- <!-- <author email="jane.doe@example.com">Jane Doe</author> -->
-
+ <author email="jennifer.e.buehler@gmail.com">Jennifer Buehler</author>
<!-- The *_depend tags are used to specify dependencies -->
<!-- Dependencies can be catkin packages or system dependencies -->
- <!-- Examples: -->
- <!-- Use build_depend for packages you need at compile time: -->
- <build_depend>message_generation</build_depend>
- <!-- Use buildtool_depend for build tool packages: -->
- <!-- <buildtool_depend>catkin</buildtool_depend> -->
- <!-- Use run_depend for packages you need at runtime: -->
- <run_depend>message_runtime</run_depend>
- <!-- Use test_depend for packages you need only for testing: -->
- <!-- <test_depend>gtest</test_depend> -->
<buildtool_depend>catkin</buildtool_depend>
+ <build_depend>message_generation</build_depend>
<build_depend>actionlib</build_depend>
<build_depend>actionlib_msgs</build_depend>
<build_depend>control_msgs</build_depend>
<build_depend>geometry_msgs</build_depend>
<build_depend>nav_msgs</build_depend>
+ <run_depend>message_runtime</run_depend>
<run_depend>actionlib</run_depend>
<run_depend>actionlib_msgs</run_depend>
<run_depend>control_msgs</run_depend>
<run_depend>geometry_msgs</run_depend>
<run_depend>nav_msgs</run_depend>
-
<!-- The export tag contains other, unspecified, tags -->
<export>
<!-- You can specify that this package is a metapackage here: -->
--
GitLab