diff options
author | Gonçalo Camelo Neves Pereira | 2018-09-26 13:27:23 +0200 |
---|---|---|
committer | Gonçalo Camelo Neves Pereira | 2018-09-26 13:27:23 +0200 |
commit | c4946b803d2ded5578bcb6d617434be008fe29d2 (patch) | |
tree | 1e854a8513dc4dae05521fb6c02b380f46593795 | |
parent | 61ce0849b6d12c23e4a8588d29ef6399ca7eebf2 (diff) | |
download | aur-c4946b803d2ded5578bcb6d617434be008fe29d2.tar.gz |
Update
-rw-r--r-- | .SRCINFO | 18 | ||||
-rw-r--r-- | PKGBUILD | 111 |
2 files changed, 57 insertions, 72 deletions
@@ -7,21 +7,21 @@ pkgbase = ros-melodic-joint-state-controller license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-sensor-msgs + makedepends = ros-melodic-hardware-interface makedepends = ros-melodic-controller-interface + makedepends = ros-melodic-roscpp + makedepends = ros-melodic-catkin makedepends = ros-melodic-pluginlib makedepends = ros-melodic-realtime-tools - makedepends = ros-melodic-catkin - makedepends = ros-melodic-roscpp - makedepends = ros-melodic-hardware-interface - depends = ros-melodic-sensor-msgs + makedepends = ros-melodic-sensor-msgs + depends = ros-melodic-hardware-interface depends = ros-melodic-controller-interface + depends = ros-melodic-roscpp depends = ros-melodic-pluginlib depends = ros-melodic-realtime-tools - depends = ros-melodic-roscpp - depends = ros-melodic-hardware-interface - source = ros-melodic-joint-state-controller::git+https://github.com/ros-gbp/ros_controllers-release.git - sha256sums = SKIP + depends = ros-melodic-sensor-msgs + source = ros-melodic-joint-state-controller-0.14.1-0.tar.gz::https://github.com/ros-gbp/ros_controllers-release/archive/release/melodic/joint_state_controller/0.14.1-0.tar.gz + sha256sums = d70784524d91288644a8cb23516e437fa2a3e37b1c885ffc9a1668196b9e50e3 pkgname = ros-melodic-joint-state-controller @@ -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 - Controller to publish joint state." url='https://github.com/ros-controls/ros_controllers/wiki' @@ -10,76 +10,61 @@ arch=('any') pkgrel=1 license=('BSD') -ros_makedepends=( - ros-melodic-sensor-msgs - ros-melodic-controller-interface - ros-melodic-pluginlib - ros-melodic-realtime-tools - ros-melodic-catkin - ros-melodic-roscpp - ros-melodic-hardware-interface -) +ros_makedepends=(ros-melodic-hardware-interface + ros-melodic-controller-interface + ros-melodic-roscpp + ros-melodic-catkin + ros-melodic-pluginlib + ros-melodic-realtime-tools + ros-melodic-sensor-msgs) +makedepends=('cmake' 'ros-build-tools' + ${ros_makedepends[@]}) -makedepends=( - 'cmake' - 'ros-build-tools' - ${ros_makedepends[@]} -) +ros_depends=(ros-melodic-hardware-interface + ros-melodic-controller-interface + ros-melodic-roscpp + ros-melodic-pluginlib + ros-melodic-realtime-tools + ros-melodic-sensor-msgs) +depends=(${ros_depends[@]}) -ros_depends=( - ros-melodic-sensor-msgs - ros-melodic-controller-interface - ros-melodic-pluginlib - ros-melodic-realtime-tools - ros-melodic-roscpp - ros-melodic-hardware-interface -) +# Git version (e.g. for debugging) +# _tag=release/melodic/joint_state_controller/${pkgver}-${_pkgver_patch} +# _dir=${pkgname} +# source=("${_dir}"::"git+https://github.com/ros-gbp/ros_controllers-release.git"#tag=${_tag}) +# sha256sums=('SKIP') -depends=( - ${ros_depends[@]} -) - -_dir=${pkgname} -source=("${_dir}"::"git+https://github.com/ros-gbp/ros_controllers-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="ros_controllers-release-release-melodic-joint_state_controller-${pkgver}-${_pkgver_patch}" +source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/ros_controllers-release/archive/release/melodic/joint_state_controller/${pkgver}-${_pkgver_patch}.tar.gz") +sha256sums=('d70784524d91288644a8cb23516e437fa2a3e37b1c885ffc9a1668196b9e50e3') 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 } |