From fd0c7c622106a7e61074778757eb34b72824aec0 Mon Sep 17 00:00:00 2001
From: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
Date: Fri, 15 Feb 2013 16:01:23 +0100
Subject: [PATCH] roscpp-core: use include file and unify recipes

Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
---
 recipes-ros/roscpp-core/cpp-common_0.3.11.bb  | 22 -------------------
 recipes-ros/roscpp-core/cpp-common_0.3.12.bb  |  8 +++++++
 recipes-ros/roscpp-core/roscpp-core.inc       |  7 ++++++
 recipes-ros/roscpp-core/roscpp-core_0.3.12.bb | 19 +++-------------
 .../roscpp-serialization_0.3.12.bb            | 21 +++---------------
 .../roscpp-core/roscpp-traits_0.3.12.bb       | 12 ++--------
 recipes-ros/roscpp-core/rostime_0.3.12.bb     | 16 ++------------
 7 files changed, 25 insertions(+), 80 deletions(-)
 delete mode 100644 recipes-ros/roscpp-core/cpp-common_0.3.11.bb
 create mode 100644 recipes-ros/roscpp-core/cpp-common_0.3.12.bb
 create mode 100644 recipes-ros/roscpp-core/roscpp-core.inc

diff --git a/recipes-ros/roscpp-core/cpp-common_0.3.11.bb b/recipes-ros/roscpp-core/cpp-common_0.3.11.bb
deleted file mode 100644
index db7be6f..0000000
--- a/recipes-ros/roscpp-core/cpp-common_0.3.11.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "Low-level build system macros and infrastructure for ROS"
-SECTION = "devel"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://package.xml;beginline=13;endline=13;md5=d566ef916e9dedc494f5f793a6690ba5"
-
-SRC_URI = "https://github.com/ros-gbp/roscpp_core-release/archive/release/cpp_common/0.3.11.tar.gz;downloadfilename=cpp-common_0.3.11.tar.gz"
-SRC_URI[md5sum] = "7bf32963b9e2c82911bf089531c18482"
-SRC_URI[sha256sum] = "86018219aa77f109d3340d332e7a041a9e047fd48d3d0e03bf2a4bd9baa66bde"
-
-S = "${WORKDIR}/roscpp_core-release-release-cpp_common-0.3.11"
-
-DEPENDS = "catkin-native"
-
-ALLOW_EMPTY = "1"
-
-EXTRA_OECMAKE = ""
-
-inherit cmake pythonnative
-
-FILES_${PN} += "${libdir}/*"
-FILES_${PN}-dev += "${datadir}/*"
-
diff --git a/recipes-ros/roscpp-core/cpp-common_0.3.12.bb b/recipes-ros/roscpp-core/cpp-common_0.3.12.bb
new file mode 100644
index 0000000..b8764bc
--- /dev/null
+++ b/recipes-ros/roscpp-core/cpp-common_0.3.12.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "Low-level build system macros and infrastructure for ROS"
+SECTION = "devel"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://package.xml;beginline=13;endline=13;md5=d566ef916e9dedc494f5f793a6690ba5"
+
+require roscpp-core.inc
+
+S = "${WORKDIR}/roscpp_core-${PV}/${ROS_BPN}"
diff --git a/recipes-ros/roscpp-core/roscpp-core.inc b/recipes-ros/roscpp-core/roscpp-core.inc
new file mode 100644
index 0000000..78b38e3
--- /dev/null
+++ b/recipes-ros/roscpp-core/roscpp-core.inc
@@ -0,0 +1,7 @@
+SRC_URI = "https://github.com/ros/roscpp_core/archive/${PV}.tar.gz;downloadfilename=rosscpp_core-${PV}.tar.gz"
+SRC_URI[md5sum] = "ddbed4b9c97e406ecf104915eb31319c"
+SRC_URI[sha256sum] = "662595304df7ba932906aa30774dfd4c3074cc4b7773620fc80de2d724769ef8"
+
+S = "${WORKDIR}/roscpp_core-${PV}/${BPN}"
+
+inherit catkin
diff --git a/recipes-ros/roscpp-core/roscpp-core_0.3.12.bb b/recipes-ros/roscpp-core/roscpp-core_0.3.12.bb
index 402b172..d57d092 100644
--- a/recipes-ros/roscpp-core/roscpp-core_0.3.12.bb
+++ b/recipes-ros/roscpp-core/roscpp-core_0.3.12.bb
@@ -3,21 +3,8 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-SRC_URI = "https://github.com/ros-gbp/roscpp_core-release/archive/release/roscpp_core/0.3.12.tar.gz;downloadfilename=roscpp-cppcore_0.3.12.tar.gz"
-SRC_URI[md5sum] = "56cfd5b11cba6d28f742106a1eeafc92"
-SRC_URI[sha256sum] = "b9ed9dadb21430deb87d56f4051da80238a36feea972ec0d3cecbfe91bb42d84"
+DEPENDS = "cpp-common roscpp-serialization roscpp-traits rostime"
 
-S = "${WORKDIR}/roscpp_core-release-release-roscpp_core-0.3.12"
-
-ALLOW_EMPTY = "1"
-
-DEPENDS = "\
-  cpp-common \
-  roscpp-serialization \
-  roscpp-traits \
-  rostime \
-"
-
-FILES_${PN} = ""
-FILES_${PN}-dev = ""
+require roscpp-core.inc
 
+S = "${WORKDIR}/roscpp_core-${PV}/${ROS_BPN}"
diff --git a/recipes-ros/roscpp-core/roscpp-serialization_0.3.12.bb b/recipes-ros/roscpp-core/roscpp-serialization_0.3.12.bb
index 6f98584..03a2833 100644
--- a/recipes-ros/roscpp-core/roscpp-serialization_0.3.12.bb
+++ b/recipes-ros/roscpp-core/roscpp-serialization_0.3.12.bb
@@ -3,23 +3,8 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-SRC_URI = "https://github.com/ros-gbp/roscpp_core-release/archive/release/roscpp_serialization/0.3.12.tar.gz;downloadfilename=roscpp-serialization_0.3.12.tar.gz"
-SRC_URI[md5sum] = "38827d61eb88211d6be597d3be30ee58"
-SRC_URI[sha256sum] = "27581440aabb75df787e850124daaec252fdca8f5b70f8a4996f82bb8eb65eb7"
+DEPENDS = "cpp-common roscpp-traits rostime"
 
-S = "${WORKDIR}/roscpp_core-release-release-roscpp_serialization-0.3.12"
+require roscpp-core.inc
 
-ALLOW_EMPTY = "1"
-
-DEPENDS = "catkin-native \
-  cpp-common \
-  roscpp-traits \
-  rostime"
-
-EXTRA_OECMAKE = " \
-    -Dcpp_common_DIR=${STAGING_DATADIR}/cpp_common/cmake/ \
-    -Droscpp_traits_DIR=${STAGING_DATADIR}/roscpp_traits/cmake/ \
-    -Drostime_DIR=${STAGING_DATADIR}/rostime/cmake/ \
-  "
-
-inherit cmake pythonnative
+S = "${WORKDIR}/roscpp_core-${PV}/${ROS_BPN}"
diff --git a/recipes-ros/roscpp-core/roscpp-traits_0.3.12.bb b/recipes-ros/roscpp-core/roscpp-traits_0.3.12.bb
index 0d6945f..f3c21f2 100644
--- a/recipes-ros/roscpp-core/roscpp-traits_0.3.12.bb
+++ b/recipes-ros/roscpp-core/roscpp-traits_0.3.12.bb
@@ -3,14 +3,6 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-SRC_URI = "https://github.com/ros-gbp/roscpp_core-release/archive/release/roscpp_traits/0.3.12.tar.gz;downloadfilename=roscpp-traits_0.3.12.tar.gz"
-SRC_URI[md5sum] = "bf9d1ef41bb21a8ee1b2defa415cc0d8"
-SRC_URI[sha256sum] = "f35cd1e29b50a2ffd89b36a9c919653ba2f6242c4b92618b544ded4f005ab912"
+require roscpp-core.inc
 
-S = "${WORKDIR}/roscpp_core-release-release-roscpp_traits-0.3.12"
-
-ALLOW_EMPTY = "1"
-
-DEPENDS = "catkin-native"
-
-inherit cmake pythonnative
+S = "${WORKDIR}/roscpp_core-${PV}/${ROS_BPN}"
diff --git a/recipes-ros/roscpp-core/rostime_0.3.12.bb b/recipes-ros/roscpp-core/rostime_0.3.12.bb
index aa2c205..51dd349 100644
--- a/recipes-ros/roscpp-core/rostime_0.3.12.bb
+++ b/recipes-ros/roscpp-core/rostime_0.3.12.bb
@@ -3,18 +3,6 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-SRC_URI = "https://github.com/ros-gbp/roscpp_core-release/archive/release/rostime/0.3.12.tar.gz;downloadfilename=rostime_0.3.12.tar.gz"
-SRC_URI[md5sum] = "ad80d12cf7dac87e7a5ef4573ced9db7"
-SRC_URI[sha256sum] = "887a89406d9682dc49c4049b4fe0766b6613208fd9df95a0efa55579b93cc965"
+DEPENDS = "boost cpp-common"
 
-S = "${WORKDIR}/roscpp_core-release-release-rostime-0.3.12"
-
-DEPENDS = "catkin-native boost cpp-common"
-
-FILES_${PN} += "${libdir}/*"
-
-inherit cmake pythonnative
-
-EXTRA_OECMAKE = " \
-  -Dcpp_common_DIR=${STAGING_DATADIR}/cpp_common/cmake/ \
-  "
+require roscpp-core.inc