Skip to content
Snippets Groups Projects
Commit bcc28108 authored by herbrechtsmeier's avatar herbrechtsmeier
Browse files

Merge pull request #127 from bulwahn/update-to-hydro

Updating to hydro release version
parents c94e6cb9 e230277b
No related branches found
No related tags found
No related merge requests found
Showing
with 46 additions and 33 deletions
DESCRIPTION = "The actionlib stack provides a standardized interface for \
interfacing with preemptable tasks."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9dedc494f5f793a6690ba5"
SRC_URI = "https://github.com/ros/${BPN}/archive/${PV}.tar.gz;downloadfilename=${BP}.tar.gz;name=archive"
SRC_URI[archive.md5sum] = "8da88314483b1330906b0ecf89c33494"
SRC_URI[archive.sha256sum] = "c76317f60afec9e4cdcce28e0b88b9aef7e355ba8295228e759aa914ed10aae4"
SRC_URI += "https://github.com/ros/actionlib/commit/f066ff531ecdea3b859881aa1f4b4b34cba910c1.patch;name=patch"
SRC_URI[patch.md5sum] = "ba32239ddb0c6837a4296119dda5f08a"
SRC_URI[patch.sha256sum] = "d07e4cd0982fee417f574acac4e2e2a0387188bf254c6f49f7ab0f8c206082b8"
DEPENDS = "actionlib-msgs roscpp rostest"
inherit catkin
SRC_URI = "https://github.com/ros/bond_core/archive/${PV}.tar.gz;downloadfilename=bond_core-${PV}.tar.gz"
SRC_URI[md5sum] = "ce18d722353318f1a6e360a271529abb"
SRC_URI[sha256sum] = "4fc2019acc136768dafc3e7422dac622cc58038aaf8a41302e45cc9510c1c723"
SRC_URI[md5sum] = "1bb6c5dd1148c67d2759e665d7ae75b3"
SRC_URI[sha256sum] = "1145db3800591e585325131cb6322366e82e634c97dd3cbb4ab43e1c1f4ec415"
S = "${WORKDIR}/bond_core-${PV}/${PN}"
......
......@@ -10,14 +10,11 @@ RDEPENDS_${PN} = "cmake make binutils binutils-symlinks gcc gcc-symlinks g++ g++
python-catkin-pkg python-argparse python-misc python-multiprocessing \
python-shell python-subprocess python-xml"
SRC_URI = "git://github.com/ros/${BPN}.git \
SRC_URI = "https://github.com/ros/catkin/archive/${PV}.tar.gz;downloadfilename={ROS_BP}.tar.gz \
file://0001-CATKIN_WORKSPACES-Don-t-require-.catkin-file.patch \
"
SRCREV = "041f6fc530b56cb6664824db399416f17c1961dd"
PV = "0.5.64+gitr${SRCPV}"
S = "${WORKDIR}/git"
SRC_URI[md5sum] = "1c30ac4fcc82ce2aedf610ea972ab4d2"
SRC_URI[sha256sum] = "2494dbe3446fe94a55f57c74260e072f97d72944d89610fe4994dbc79cf1a561"
inherit catkin
......
......@@ -11,14 +11,9 @@ SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5"
SRC_URI = "https://github.com/ros/${ROS_BPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_BP}.tar.gz;name=archive"
SRC_URI[archive.md5sum] = "e844b2f708946c6245093b30f9f7f3b4"
SRC_URI[archive.sha256sum] = "93347aca95be80e78253b964f363cd5486fbf17cf939d224b46ed1de8287679d"
SRC_URI += "https://github.com/ros/class_loader/commit/384a880d2dcf1bc51fe62d5c4648756b4575dba3.patch;name=patch"
SRC_URI[patch.md5sum] = "c95550a5b8197338e57be732b9fa2225"
SRC_URI[patch.sha256sum] = "9029530d2a62c44e1614483ec312572d7cfa47298c4392b066f802c0454a97bf"
SRC_URI = "https://github.com/ros/${ROS_BPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_BP}.tar.gz"
SRC_URI[md5sum] = "c3bbc15c580dbf3b814b8af84218a777"
SRC_URI[sha256sum] = "afaa155be9e34d905396c96eac040007e23b4ba90d2b2677ab67a1b32086fe13"
DEPENDS = "console-bridge libpoco"
......
SRC_URI = "https://github.com/ros/common_msgs/archive/${PV}.tar.gz;downloadfilename=common_msgs-${PV}.tar.gz"
SRC_URI[md5sum] = "84fb70d6ba4c796903bb4b95b551e19a"
SRC_URI[sha256sum] = "a4a02bce606c3468dcc93abdc49fc855f0d81c90a56f24594f8fa691f9a6b776"
SRC_URI[md5sum] = "6259ec362103ed96abbcf7d67703aed5"
SRC_URI[sha256sum] = "54864270e973cec64f9315aed9e07f8d3837c409602dd18653c843c7a35690d0"
inherit catkin
......
......@@ -15,8 +15,8 @@ LIC_FILES_CHKSUM = "\
DEPENDS = "boost"
SRC_URI = "https://github.com/ros/console_bridge/archive/${PV}.tar.gz;downloadfilename=${BP}.tar.gz"
SRC_URI[md5sum] = "82c24b68ffaacee540055571669dcdd7"
SRC_URI[sha256sum] = "69c3efa4ef86b2c3ffb37d29a9c6169853975a3bc362815c9cffc40f74b25f18"
SRC_URI[md5sum] = "e484d34bf0170ee12311d0fc6dd5f4fe"
SRC_URI[sha256sum] = "d4bdd0b6bce0c6fa9ff18b8926d4953161451bc49dd11497211eb1a62cfe72b7"
S = "${WORKDIR}/console_bridge-${PV}"
......
From 93cb4ebe5c4063d3ed5c0baf0b696476a90306cb Mon Sep 17 00:00:00 2001
From: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
Date: Tue, 4 Jun 2013 17:53:08 +0200
From 4e51c828b27eb1d67a3199c692aac1783f853493 Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Fri, 12 Jul 2013 09:59:13 +0200
Subject: [PATCH] gencpp-extras.cmake.em: Use find_program for GENCPP_BIN
Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
This patch was originally created by
Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>.
I only adjusted it to the current version.
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
---
cmake/gencpp-extras.cmake.em | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/cmake/gencpp-extras.cmake.em b/cmake/gencpp-extras.cmake.em
index a77a5f1..1d4bf10 100644
index 87f46fd..4fc5284 100644
--- a/cmake/gencpp-extras.cmake.em
+++ b/cmake/gencpp-extras.cmake.em
@@ -1,13 +1,17 @@
@[if DEVELSPACE]@
# bin and template dir variables in develspace
-set(GENCPP_BIN @(CMAKE_CURRENT_SOURCE_DIR)/scripts/gen_cpp.py)
+set(GENCPP_BIN_DIR @(CMAKE_CURRENT_SOURCE_DIR)/scripts)
set(GENCPP_TEMPLATE_DIR @(CMAKE_CURRENT_SOURCE_DIR)/scripts)
-set(GENCPP_BIN "@(CMAKE_CURRENT_SOURCE_DIR)/scripts/gen_cpp.py")
+set(GENCPP_BIN_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts")
set(GENCPP_TEMPLATE_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts")
+set(CATKIN_FIND_ROOT_PATH_MODE NO_CMAKE_FIND_ROOT_PATH)
@[else]@
# bin and template dir variables in installspace
-set(GENCPP_BIN @(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_BIN_DESTINATION)/gen_cpp.py)
-set(GENCPP_TEMPLATE_DIR @(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_SHARE_DESTINATION))
+set(GENCPP_BIN_DIR @(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_BIN_DESTINATION))
-set(GENCPP_BIN "@(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_BIN_DESTINATION)/gen_cpp.py")
-set(GENCPP_TEMPLATE_DIR "@(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_SHARE_DESTINATION)")
+set(GENCPP_BIN_DIR "@(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_BIN_DESTINATION)")
+set(GENCPP_TEMPLATE_DIR "${CMAKE_CURRENT_LIST_DIR}/..")
+set(CATKIN_FIND_ROOT_PATH_MODE "")
@[end if]@
......@@ -34,5 +38,5 @@ index a77a5f1..1d4bf10 100644
# The generated .h files should be added ALL_GEN_OUTPUT_FILES_cpp
macro(_generate_msg_cpp ARG_PKG ARG_MSG ARG_IFLAGS ARG_MSG_DEPS ARG_GEN_OUTPUT_DIR)
--
1.7.0.4
1.7.9.5
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment