diff options
author | Gonçalo Camelo Neves Pereira | 2018-09-08 14:57:20 +0200 |
---|---|---|
committer | Gonçalo Camelo Neves Pereira | 2018-09-08 14:57:20 +0200 |
commit | c5210da26ba9a377206fd6610c63bec580777fe9 (patch) | |
tree | a266f286f3ddfa1b592a8eb6edfe0fce0488c23c | |
parent | 1017284951d592eabc8c4f12f3f0f497f50124a1 (diff) | |
download | aur-c5210da26ba9a377206fd6610c63bec580777fe9.tar.gz |
Update!
-rw-r--r-- | .SRCINFO | 34 | ||||
-rw-r--r-- | PKGBUILD | 133 |
2 files changed, 91 insertions, 76 deletions
@@ -1,6 +1,6 @@ pkgbase = ros-melodic-ros-comm pkgdesc = ROS - ROS communications-related packages, including core client libraries (roscpp, rospy) and graph introspection tools (rostopic, rosnode, rosservice, rosparam). - pkgver = 1.14.2 + pkgver = 1.14.3 pkgrel = 1 url = http://www.ros.org/wiki/ros_comm arch = any @@ -8,30 +8,30 @@ pkgbase = ros-melodic-ros-comm makedepends = cmake makedepends = ros-build-tools makedepends = ros-melodic-catkin - depends = ros-melodic-ros - depends = ros-melodic-roslisp + depends = ros-melodic-xmlrpcpp + depends = ros-melodic-rospy depends = ros-melodic-rosgraph-msgs - depends = ros-melodic-rostest - depends = ros-melodic-rosservice - depends = ros-melodic-std-srvs - depends = ros-melodic-rosconsole - depends = ros-melodic-rosgraph - depends = ros-melodic-rosnode depends = ros-melodic-roscpp + depends = ros-melodic-roslisp + depends = ros-melodic-rosnode + depends = ros-melodic-std-srvs depends = ros-melodic-rostopic depends = ros-melodic-rosparam - depends = ros-melodic-topic-tools - depends = ros-melodic-xmlrpcpp - depends = ros-melodic-roslaunch depends = ros-melodic-rosbag + depends = ros-melodic-rostest + depends = ros-melodic-rosconsole + depends = ros-melodic-roslaunch depends = ros-melodic-roswtf + depends = ros-melodic-rosout depends = ros-melodic-rosmaster - depends = ros-melodic-rosmsg + depends = ros-melodic-rosservice + depends = ros-melodic-ros depends = ros-melodic-message-filters - depends = ros-melodic-rospy - depends = ros-melodic-rosout - source = ros-melodic-ros-comm-1.14.2-0.tar.gz::https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/ros_comm/1.14.2-0.tar.gz - sha256sums = 2866678d01ab64234e1a6cfd3267520451ac668d9d124ad9517cbf22646f5c2c + depends = ros-melodic-rosgraph + depends = ros-melodic-topic-tools + depends = ros-melodic-rosmsg + source = ros-melodic-ros-comm::git+https://github.com/ros-gbp/ros_comm-release.git + sha256sums = SKIP pkgname = ros-melodic-ros-comm @@ -1,80 +1,95 @@ -# Script generated with import_catkin_packages.py -# For more information: https://github.com/bchretien/arch-ros-stacks +# Script generated with import_catkin_packages.py. +# For more information: https://github.com/bchretien/arch-ros-stacks. pkgdesc="ROS - ROS communications-related packages, including core client libraries (roscpp, rospy) and graph introspection tools (rostopic, rosnode, rosservice, rosparam)." url='http://www.ros.org/wiki/ros_comm' pkgname='ros-melodic-ros-comm' -pkgver='1.14.2' +pkgver='1.14.3' _pkgver_patch=0 arch=('any') pkgrel=1 license=('BSD') -ros_makedepends=(ros-melodic-catkin) -makedepends=('cmake' 'ros-build-tools' - ${ros_makedepends[@]}) +ros_makedepends=( + ros-melodic-catkin +) -ros_depends=(ros-melodic-ros - ros-melodic-roslisp - ros-melodic-rosgraph-msgs - ros-melodic-rostest - ros-melodic-rosservice - ros-melodic-std-srvs - ros-melodic-rosconsole - ros-melodic-rosgraph - ros-melodic-rosnode - ros-melodic-roscpp - ros-melodic-rostopic - ros-melodic-rosparam - ros-melodic-topic-tools - ros-melodic-xmlrpcpp - ros-melodic-roslaunch - ros-melodic-rosbag - ros-melodic-roswtf - ros-melodic-rosmaster - ros-melodic-rosmsg - ros-melodic-message-filters - ros-melodic-rospy - ros-melodic-rosout) -depends=(${ros_depends[@]}) +makedepends=( + 'cmake' + 'ros-build-tools' + ${ros_makedepends[@]} +) -# Git version (e.g. for debugging) -# _tag=release/melodic/ros_comm/${pkgver}-${_pkgver_patch} -# _dir=${pkgname} -# source=("${_dir}"::"git+https://github.com/ros-gbp/ros_comm-release.git"#tag=${_tag}) -# sha256sums=('SKIP') +ros_depends=( + ros-melodic-xmlrpcpp + ros-melodic-rospy + ros-melodic-rosgraph-msgs + ros-melodic-roscpp + ros-melodic-roslisp + ros-melodic-rosnode + ros-melodic-std-srvs + ros-melodic-rostopic + ros-melodic-rosparam + ros-melodic-rosbag + ros-melodic-rostest + ros-melodic-rosconsole + ros-melodic-roslaunch + ros-melodic-roswtf + ros-melodic-rosout + ros-melodic-rosmaster + ros-melodic-rosservice + ros-melodic-ros + ros-melodic-message-filters + ros-melodic-rosgraph + ros-melodic-topic-tools + ros-melodic-rosmsg +) -# Tarball version (faster download) -_dir="ros_comm-release-release-melodic-ros_comm-${pkgver}-${_pkgver_patch}" -source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/ros_comm/${pkgver}-${_pkgver_patch}.tar.gz") -sha256sums=('2866678d01ab64234e1a6cfd3267520451ac668d9d124ad9517cbf22646f5c2c') +depends=( + ${ros_depends[@]} +) + +_dir=${pkgname} +source=("${_dir}"::"git+https://github.com/ros-gbp/ros_comm-release.git") +sha256sums=('SKIP') + +prepare() { + cd ${srcdir}/${_dir} + git checkout upstream + _pkgname=$(echo ${pkgname} | sed 's/ros-lunar-//' | sed 's/-/_/g') + + if [ -d ${_pkgname} ]; then + git subtree split -P ${_pkgname} --branch ${_pkgname} + git checkout ${_pkgname} + fi +} build() { - # Use ROS environment variables - source /usr/share/ros-build-tools/clear-ros-env.sh - [ -f /opt/ros/melodic/setup.bash ] && source /opt/ros/melodic/setup.bash + # Use ROS environment variables. + source /usr/share/ros-build-tools/clear-ros-env.sh + [ -f /opt/ros/melodic/setup.bash ] && source /opt/ros/melodic/setup.bash - # Create build directory - [ -d ${srcdir}/build ] || mkdir ${srcdir}/build - cd ${srcdir}/build + # Create the build directory. + [ -d ${srcdir}/build ] || mkdir ${srcdir}/build + cd ${srcdir}/build - # Fix Python2/Python3 conflicts - /usr/share/ros-build-tools/fix-python-scripts.sh -v 2 ${srcdir}/${_dir} + # Fix Python2/Python3 conflicts. + /usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir} - # Build project - cmake ${srcdir}/${_dir} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCATKIN_BUILD_BINARY_PACKAGE=ON \ - -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 \ - -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \ - -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \ - -DPYTHON_BASENAME=-python2.7 \ - -DSETUPTOOLS_DEB_LAYOUT=OFF - make + # Build the project. + cmake ${srcdir}/${_dir} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCATKIN_BUILD_BINARY_PACKAGE=ON \ + -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \ + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \ + -DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \ + -DPYTHON_BASENAME=.cpython-37m \ + -DSETUPTOOLS_DEB_LAYOUT=OFF + make } package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}/" install + cd "${srcdir}/build" + make DESTDIR="${pkgdir}/" install } |