diff options
| author | Gonçalo Camelo Neves Pereira | 2018-09-26 13:21:59 +0200 |
|---|---|---|
| committer | Gonçalo Camelo Neves Pereira | 2018-09-26 13:21:59 +0200 |
| commit | 12d6e4ddfaf6409b33e591842cdef73a8afa03fc (patch) | |
| tree | e074c97eacf33f8006c30300615dd6ec293ae849 | |
| parent | 054365079ae43f30f881f5a1e952dedb9026474f (diff) | |
| download | aur-12d6e4ddfaf6409b33e591842cdef73a8afa03fc.tar.gz | |
Update
| -rw-r--r-- | .SRCINFO | 22 | ||||
| -rw-r--r-- | PKGBUILD | 121 |
2 files changed, 64 insertions, 79 deletions
@@ -7,26 +7,26 @@ pkgbase = ros-melodic-actionlib license = BSD makedepends = cmake makedepends = ros-build-tools + makedepends = ros-melodic-std-msgs makedepends = ros-melodic-actionlib-msgs - makedepends = ros-melodic-message-generation + makedepends = ros-melodic-roscpp makedepends = ros-melodic-catkin - makedepends = ros-melodic-rospy + makedepends = ros-melodic-message-generation makedepends = ros-melodic-rostest - makedepends = ros-melodic-roscpp - makedepends = ros-melodic-std-msgs + makedepends = ros-melodic-rospy makedepends = boost + depends = ros-melodic-rostopic + depends = ros-melodic-std-msgs depends = ros-melodic-actionlib-msgs depends = ros-melodic-message-runtime - depends = ros-melodic-rostopic - depends = ros-melodic-rospy + depends = ros-melodic-roscpp depends = ros-melodic-roslib depends = ros-melodic-rostest - depends = ros-melodic-roscpp - depends = ros-melodic-std-msgs - depends = boost + depends = ros-melodic-rospy depends = wxpython - source = ros-melodic-actionlib::git+https://github.com/ros-gbp/actionlib-release.git - sha256sums = SKIP + depends = boost + source = ros-melodic-actionlib-1.11.14-0.tar.gz::https://github.com/ros-gbp/actionlib-release/archive/release/melodic/actionlib/1.11.14-0.tar.gz + sha256sums = 6fe3fdad940d570f8a1c0c6ebd4f2f847b015097301003ab8f9f81990f837108 pkgname = ros-melodic-actionlib @@ -1,5 +1,5 @@ -# 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 - The actionlib stack provides a standardized interface for interfacing with preemptable tasks." url='http://www.ros.org/wiki/actionlib' @@ -10,81 +10,66 @@ arch=('any') pkgrel=1 license=('BSD') -ros_makedepends=( - ros-melodic-actionlib-msgs - ros-melodic-message-generation - ros-melodic-catkin - ros-melodic-rospy - ros-melodic-rostest - ros-melodic-roscpp - ros-melodic-std-msgs -) +ros_makedepends=(ros-melodic-std-msgs + ros-melodic-actionlib-msgs + ros-melodic-roscpp + ros-melodic-catkin + ros-melodic-message-generation + ros-melodic-rostest + ros-melodic-rospy) +makedepends=('cmake' 'ros-build-tools' + ${ros_makedepends[@]} + boost) -makedepends=( - 'cmake' - 'ros-build-tools' - ${ros_makedepends[@]} - boost -) +ros_depends=(ros-melodic-rostopic + ros-melodic-std-msgs + ros-melodic-actionlib-msgs + ros-melodic-message-runtime + ros-melodic-roscpp + ros-melodic-roslib + ros-melodic-rostest + ros-melodic-rospy) +depends=(${ros_depends[@]} + wxpython + boost) -ros_depends=( - ros-melodic-actionlib-msgs - ros-melodic-message-runtime - ros-melodic-rostopic - ros-melodic-rospy - ros-melodic-roslib - ros-melodic-rostest - ros-melodic-roscpp - ros-melodic-std-msgs -) +# Git version (e.g. for debugging) +# _tag=release/melodic/actionlib/${pkgver}-${_pkgver_patch} +# _dir=${pkgname} +# source=("${_dir}"::"git+https://github.com/ros-gbp/actionlib-release.git"#tag=${_tag}) +# sha256sums=('SKIP') -depends=( - ${ros_depends[@]} - boost - wxpython -) - -_dir=${pkgname} -source=("${_dir}"::"git+https://github.com/ros-gbp/actionlib-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 -} +# Tarball version (faster download) +_dir="actionlib-release-release-melodic-actionlib-${pkgver}-${_pkgver_patch}" +source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/actionlib-release/archive/release/melodic/actionlib/${pkgver}-${_pkgver_patch}.tar.gz") +sha256sums=('6fe3fdad940d570f8a1c0c6ebd4f2f847b015097301003ab8f9f81990f837108') 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 the build directory. - [ -d ${srcdir}/build ] || mkdir ${srcdir}/build - cd ${srcdir}/build + # Create 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 3 ${srcdir}/${_dir} + # Fix Python2/Python3 conflicts + /usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir} - # 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 + # Build 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 } |