From 8249cc8dd572391d19fbdd1efb9450b2486d2756 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Tue, 12 Aug 2014 06:55:51 +0200 Subject: [PATCH] improving formatting after automated style check After running oe-stylize.py on all recipes in recipes-ros, this commit improves the formatting of some recipes. To achieve this, I executed these commands in recipes-ros: find . -name *.bb | sed 's#\(.*\)#./oe-stylize.py \1 > \1_sanitized#' | sh find . -name *.bb | sed 's#\(.*\)#diff -Naur \1 \1_sanitized#' | sh > diffs Then, I manually inspected the diffs file, and improved the recipes. For the DESCRIPTION line in the addressed recipes, the line width of 100 characters was chosen, as the LIC_FILES_CHKSUM line and SRC_URI line usually are also around about 100 characters long. Hence, choosing a shorter line width, e.g. 80 characters, would have only created more line breaks, but not reduced the need to use a file viewer with which 100 characters line width can be displayed. For the github file and diff viewer and most editors on reasonably-sized screens, 100 character line width is no problem. --- recipes-ros/ar-track-alvar/ar-track-alvar_0.4.1.bb | 4 ++-- recipes-ros/control-msgs/control-msgs_1.2.0.bb | 5 ++--- .../control-toolbox/control-toolbox_1.10.4.bb | 5 ++--- .../dynamic-reconfigure_1.5.37.bb | 9 ++++----- recipes-ros/freenect-stack/freenect-camera_0.3.2.bb | 2 +- recipes-ros/octomap-ros/octomap-ros_0.3.1.bb | 6 +++--- recipes-ros/packagegroups/packagegroup-ros-world.bb | 2 +- recipes-ros/pluginlib/pluginlib_1.9.24.bb | 4 ++-- recipes-ros/robot-model/collada-urdf_1.10.18.bb | 12 ++++++------ .../robot-model/urdf-parser-plugin_1.10.18.bb | 1 - recipes-ros/ros-comm/rosparam_1.10.10.bb | 4 ++-- recipes-ros/ros-comm/xmlrpcpp_1.10.10.bb | 8 +++----- .../ros-control/controller-interface_0.7.2.bb | 1 - .../ros-control/controller-manager-msgs_0.7.2.bb | 1 - .../rosconsole-bridge/rosconsole-bridge_0.3.4.bb | 2 +- 15 files changed, 29 insertions(+), 37 deletions(-) diff --git a/recipes-ros/ar-track-alvar/ar-track-alvar_0.4.1.bb b/recipes-ros/ar-track-alvar/ar-track-alvar_0.4.1.bb index 806ae95..b1cce2b 100644 --- a/recipes-ros/ar-track-alvar/ar-track-alvar_0.4.1.bb +++ b/recipes-ros/ar-track-alvar/ar-track-alvar_0.4.1.bb @@ -3,14 +3,14 @@ SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=f62de161dc7a8f859a0502707b17209e" +DEPENDS = "cmake-modules cv-bridge image-transport libtinyxml pcl-ros resource-retriever roscpp tf visualization-msgs" + SRC_URI = "https://github.com/sniekum/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" SRC_URI[md5sum] = "2786829c43437da2aa93eff77a4c862f" SRC_URI[sha256sum] = "f87759a0a4decbf0da3ff9341e1aa6fcfdcaf302f0844d6ace371c7e5dc9e53e" SRC_URI += "file://0001-used-cmake_modules-to-find-TinyXML.patch" -DEPENDS = "cmake-modules cv-bridge image-transport libtinyxml pcl-ros resource-retriever roscpp tf visualization-msgs" - S = "${WORKDIR}/${ROS_SP}" inherit catkin diff --git a/recipes-ros/control-msgs/control-msgs_1.2.0.bb b/recipes-ros/control-msgs/control-msgs_1.2.0.bb index 06fd3f6..07abd84 100644 --- a/recipes-ros/control-msgs/control-msgs_1.2.0.bb +++ b/recipes-ros/control-msgs/control-msgs_1.2.0.bb @@ -1,6 +1,5 @@ -DESCRIPTION = "control_msgs contains base messages and actions \ -useful for controlling robots. It provides representations for \ -controller setpoints and joint and cartesian trajectories." +DESCRIPTION = "control_msgs contains base messages and actions useful for controlling robots. It \ +provides representations for controller setpoints and joint and cartesian trajectories." SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=12;endline=12;md5=d566ef916e9dedc494f5f793a6690ba5" diff --git a/recipes-ros/control-toolbox/control-toolbox_1.10.4.bb b/recipes-ros/control-toolbox/control-toolbox_1.10.4.bb index 23e799a..65efe2e 100644 --- a/recipes-ros/control-toolbox/control-toolbox_1.10.4.bb +++ b/recipes-ros/control-toolbox/control-toolbox_1.10.4.bb @@ -1,11 +1,10 @@ -DESCRIPTION = "The control toolbox contains modules that are useful \ -across all controllers." +DESCRIPTION = "The control toolbox contains modules that are useful across all controllers." SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=7;endline=7;md5=d566ef916e9dedc494f5f793a6690ba5" DEPENDS = "rosconsole tf roscpp angles message-generation \ - dynamic-reconfigure libtinyxml realtime-tools message-filters" + dynamic-reconfigure libtinyxml realtime-tools message-filters" SRC_URI = "https://github.com/ros-controls/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" SRC_URI[md5sum] = "28f8bc6536401456b207e20b4de2e8b3" diff --git a/recipes-ros/dynamic-reconfigure/dynamic-reconfigure_1.5.37.bb b/recipes-ros/dynamic-reconfigure/dynamic-reconfigure_1.5.37.bb index 0bad068..f8231ed 100644 --- a/recipes-ros/dynamic-reconfigure/dynamic-reconfigure_1.5.37.bb +++ b/recipes-ros/dynamic-reconfigure/dynamic-reconfigure_1.5.37.bb @@ -1,16 +1,15 @@ -DESCRIPTION = "\ -This unary stack contains the dynamic_reconfigure package which provides a means to change \ -node parameters at any time without having to restart the node." +DESCRIPTION = "This unary stack contains the dynamic_reconfigure package which provides a means to \ +change node parameters at any time without having to restart the node." SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5" +DEPENDS = "roscpp std-msgs roslib" + SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" SRC_URI[md5sum] = "38248b33c5c8bc6d97d8f9e3ae349016" SRC_URI[sha256sum] = "5f2c978861d6273af9fc40ff53b457d15b871ea7276278dcbd3eb9ba70044da3" -DEPENDS = "roscpp std-msgs roslib" - S = "${WORKDIR}/${ROS_SP}" inherit catkin diff --git a/recipes-ros/freenect-stack/freenect-camera_0.3.2.bb b/recipes-ros/freenect-stack/freenect-camera_0.3.2.bb index d7f2e8e..0226067 100644 --- a/recipes-ros/freenect-stack/freenect-camera_0.3.2.bb +++ b/recipes-ros/freenect-stack/freenect-camera_0.3.2.bb @@ -5,6 +5,6 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=12;endline=12;md5=d566ef916e9dedc494f5f793a6690ba5" DEPENDS = "camera-info-manager diagnostic-updater dynamic-reconfigure \ - image-transport libfreenect nodelet roscpp sensor-msgs pluginlib" + image-transport libfreenect nodelet roscpp sensor-msgs pluginlib" require freenect-stack.inc diff --git a/recipes-ros/octomap-ros/octomap-ros_0.3.1.bb b/recipes-ros/octomap-ros/octomap-ros_0.3.1.bb index ca4cd81..a977613 100644 --- a/recipes-ros/octomap-ros/octomap-ros_0.3.1.bb +++ b/recipes-ros/octomap-ros/octomap-ros_0.3.1.bb @@ -14,7 +14,7 @@ S = "${WORKDIR}/${ROS_SP}" inherit catkin do_configure_append() { - sed -i -e 's: /usr/lib/liboctomap.so: ${STAGING_LIBDIR}/liboctomap.so:g' \ - -e 's: /usr/lib/liboctomath.so: ${STAGING_LIBDIR}/liboctomath.so:g' \ - ${B}/CMakeFiles/octomap_ros.dir/build.make + sed -i -e 's: /usr/lib/liboctomap.so: ${STAGING_LIBDIR}/liboctomap.so:g' \ + -e 's: /usr/lib/liboctomath.so: ${STAGING_LIBDIR}/liboctomath.so:g' \ + ${B}/CMakeFiles/octomap_ros.dir/build.make } diff --git a/recipes-ros/packagegroups/packagegroup-ros-world.bb b/recipes-ros/packagegroups/packagegroup-ros-world.bb index f717a42..d72f99a 100644 --- a/recipes-ros/packagegroups/packagegroup-ros-world.bb +++ b/recipes-ros/packagegroups/packagegroup-ros-world.bb @@ -154,7 +154,7 @@ RDEPENDS_${PN} = "\ sound-play \ communication-tests \ cyclic-timer-tests \ - oneshot-timer-tests \ + oneshot-timer-tests \ urdfdom-headers \ urdfdom-py \ urdf-tutorial \ diff --git a/recipes-ros/pluginlib/pluginlib_1.9.24.bb b/recipes-ros/pluginlib/pluginlib_1.9.24.bb index cb0f72a..c61e932 100644 --- a/recipes-ros/pluginlib/pluginlib_1.9.24.bb +++ b/recipes-ros/pluginlib/pluginlib_1.9.24.bb @@ -4,10 +4,10 @@ SECTION = "devel" LICENSE = "BSD & BSL-1.0" LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=10;md5=bbbb6ab628b1f3daee74dd9c62bee312" +DEPENDS = "boost class-loader rosconsole roslib libtinyxml" + SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" SRC_URI[md5sum] = "681c98bb532cbd663f56f59590dcdae5" SRC_URI[sha256sum] = "096112e2e5063bfca583bfa4ba3e3f47b51befd5e4b6c3edcc8311986b39a70f" -DEPENDS = "boost class-loader rosconsole roslib libtinyxml" - inherit catkin diff --git a/recipes-ros/robot-model/collada-urdf_1.10.18.bb b/recipes-ros/robot-model/collada-urdf_1.10.18.bb index bf1e707..1b107f1 100644 --- a/recipes-ros/robot-model/collada-urdf_1.10.18.bb +++ b/recipes-ros/robot-model/collada-urdf_1.10.18.bb @@ -8,10 +8,10 @@ DEPENDS = "angles assimp resource-retriever collada-dom collada-parser roscpp ur require robot-model.inc do_configure_append() { - for f in collada_urdf.dir collada_to_urdf.dir urdf_to_collada.dir - do - sed -i -e 's: /usr/lib/liboctomap.so: ${STAGING_LIBDIR}/liboctomap.so:g' \ - -e 's: /usr/lib/liboctomath.so: ${STAGING_LIBDIR}/liboctomath.so:g' \ - ${B}/CMakeFiles/$f/build.make - done + for f in collada_urdf.dir collada_to_urdf.dir urdf_to_collada.dir + do + sed -i -e 's: /usr/lib/liboctomap.so: ${STAGING_LIBDIR}/liboctomap.so:g' \ + -e 's: /usr/lib/liboctomath.so: ${STAGING_LIBDIR}/liboctomath.so:g' \ + ${B}/CMakeFiles/$f/build.make + done } diff --git a/recipes-ros/robot-model/urdf-parser-plugin_1.10.18.bb b/recipes-ros/robot-model/urdf-parser-plugin_1.10.18.bb index 04ce6e1..edbb180 100644 --- a/recipes-ros/robot-model/urdf-parser-plugin_1.10.18.bb +++ b/recipes-ros/robot-model/urdf-parser-plugin_1.10.18.bb @@ -6,4 +6,3 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9de DEPENDS = "urdfdom-headers" require robot-model.inc - diff --git a/recipes-ros/ros-comm/rosparam_1.10.10.bb b/recipes-ros/ros-comm/rosparam_1.10.10.bb index ff5e1b2..d014d12 100644 --- a/recipes-ros/ros-comm/rosparam_1.10.10.bb +++ b/recipes-ros/ros-comm/rosparam_1.10.10.bb @@ -1,5 +1,5 @@ -DESCRIPTION = "the rosparam command-line tool for getting and setting \ - ROS Parameters on the Parameter Server using YAML-encoded files." +DESCRIPTION = "the rosparam command-line tool for getting and setting ROS Parameters on the \ + Parameter Server using YAML-encoded files." SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=15;endline=15;md5=d566ef916e9dedc494f5f793a6690ba5" diff --git a/recipes-ros/ros-comm/xmlrpcpp_1.10.10.bb b/recipes-ros/ros-comm/xmlrpcpp_1.10.10.bb index 6ff0a9d..c1300b5 100644 --- a/recipes-ros/ros-comm/xmlrpcpp_1.10.10.bb +++ b/recipes-ros/ros-comm/xmlrpcpp_1.10.10.bb @@ -1,8 +1,6 @@ -DESCRIPTION = \ - "XmlRpc++ is a C++ implementation of the XML-RPC protocol. This version is \ - heavily modified from the package available on SourceForge in order to \ - support roscpp's threading model. As such, we are maintaining our \ - own fork." +DESCRIPTION = "XmlRpc++ is a C++ implementation of the XML-RPC protocol. This version is heavily \ + modified from the package available on SourceForge in order to support roscpp's threading model. \ + As such, we are maintaining our own fork." SECTION = "devel" LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=184dd1523b9a109aead3fbbe0b4262e0" diff --git a/recipes-ros/ros-control/controller-interface_0.7.2.bb b/recipes-ros/ros-control/controller-interface_0.7.2.bb index 1599151..c5d82c3 100644 --- a/recipes-ros/ros-control/controller-interface_0.7.2.bb +++ b/recipes-ros/ros-control/controller-interface_0.7.2.bb @@ -6,4 +6,3 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=7;endline=7;md5=d566ef916e9dedc DEPENDS = "roscpp hardware-interface pluginlib" require ros-control.inc - diff --git a/recipes-ros/ros-control/controller-manager-msgs_0.7.2.bb b/recipes-ros/ros-control/controller-manager-msgs_0.7.2.bb index aa437d4..7d81dca 100644 --- a/recipes-ros/ros-control/controller-manager-msgs_0.7.2.bb +++ b/recipes-ros/ros-control/controller-manager-msgs_0.7.2.bb @@ -6,4 +6,3 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=7;endline=7;md5=d566ef916e9dedc DEPENDS = "message-generation std-msgs roscpp-serialization" require ros-control.inc - diff --git a/recipes-ros/rosconsole-bridge/rosconsole-bridge_0.3.4.bb b/recipes-ros/rosconsole-bridge/rosconsole-bridge_0.3.4.bb index 88c2e30..3ea6658 100644 --- a/recipes-ros/rosconsole-bridge/rosconsole-bridge_0.3.4.bb +++ b/recipes-ros/rosconsole-bridge/rosconsole-bridge_0.3.4.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9de DEPENDS = "rosconsole console-bridge" -SRC_URI ="https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" +SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" SRC_URI[md5sum] = "d847f18aa69b913f52489bb238281ee0" SRC_URI[sha256sum] = "3fc09e575f41d33ee31e1e4392ed09b8fed549634478e5d7176818479e9216dc"