diff options
author | Gonçalo Camelo Neves Pereira | 2018-09-26 13:23:43 +0200 |
---|---|---|
committer | Gonçalo Camelo Neves Pereira | 2018-09-26 13:23:43 +0200 |
commit | d47e930d0e2f27d7e862c5575151496f6437e5b3 (patch) | |
tree | ea4064401f66d39782634d225b9d7382862a66bb | |
parent | 85becf39733e233b80e89ff5f022d7bd2c1c36f6 (diff) | |
download | aur-d47e930d0e2f27d7e862c5575151496f6437e5b3.tar.gz |
Update
-rw-r--r-- | .SRCINFO | 18 | ||||
-rw-r--r-- | PKGBUILD | 119 |
2 files changed, 61 insertions, 76 deletions
@@ -7,25 +7,25 @@ pkgbase = ros-melodic-control-toolbox license = BSD makedepends = cmake makedepends = ros-build-tools + makedepends = ros-melodic-dynamic-reconfigure + makedepends = ros-melodic-std-msgs + makedepends = ros-melodic-roscpp + makedepends = ros-melodic-catkin makedepends = ros-melodic-control-msgs makedepends = ros-melodic-realtime-tools makedepends = ros-melodic-message-generation - makedepends = ros-melodic-catkin makedepends = ros-melodic-cmake-modules - makedepends = ros-melodic-dynamic-reconfigure - makedepends = ros-melodic-roscpp - makedepends = ros-melodic-std-msgs makedepends = tinyxml + depends = ros-melodic-dynamic-reconfigure + depends = ros-melodic-std-msgs depends = ros-melodic-message-runtime + depends = ros-melodic-roscpp depends = ros-melodic-control-msgs depends = ros-melodic-realtime-tools depends = ros-melodic-cmake-modules - depends = ros-melodic-dynamic-reconfigure - depends = ros-melodic-roscpp - depends = ros-melodic-std-msgs depends = tinyxml - source = ros-melodic-control-toolbox::git+https://github.com/ros-gbp/control_toolbox-release.git - sha256sums = SKIP + source = ros-melodic-control-toolbox-1.16.0-0.tar.gz::https://github.com/ros-gbp/control_toolbox-release/archive/release/melodic/control_toolbox/1.16.0-0.tar.gz + sha256sums = adf41cc48636370fc100e01035663240b5328e593eda03980958451292654d3d pkgname = ros-melodic-control-toolbox @@ -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 control toolbox contains modules that are useful across all controllers." url='http://ros.org/wiki/control_toolbox' @@ -10,80 +10,65 @@ arch=('any') pkgrel=1 license=('BSD') -ros_makedepends=( - ros-melodic-control-msgs - ros-melodic-realtime-tools - ros-melodic-message-generation - ros-melodic-catkin - ros-melodic-cmake-modules - ros-melodic-dynamic-reconfigure - ros-melodic-roscpp - ros-melodic-std-msgs -) +ros_makedepends=(ros-melodic-dynamic-reconfigure + ros-melodic-std-msgs + ros-melodic-roscpp + ros-melodic-catkin + ros-melodic-control-msgs + ros-melodic-realtime-tools + ros-melodic-message-generation + ros-melodic-cmake-modules) +makedepends=('cmake' 'ros-build-tools' + ${ros_makedepends[@]} + tinyxml) -makedepends=( - 'cmake' - 'ros-build-tools' - ${ros_makedepends[@]} - tinyxml -) +ros_depends=(ros-melodic-dynamic-reconfigure + ros-melodic-std-msgs + ros-melodic-message-runtime + ros-melodic-roscpp + ros-melodic-control-msgs + ros-melodic-realtime-tools + ros-melodic-cmake-modules) +depends=(${ros_depends[@]} + tinyxml) -ros_depends=( - ros-melodic-message-runtime - ros-melodic-control-msgs - ros-melodic-realtime-tools - ros-melodic-cmake-modules - ros-melodic-dynamic-reconfigure - ros-melodic-roscpp - ros-melodic-std-msgs -) +# Git version (e.g. for debugging) +# _tag=release/melodic/control_toolbox/${pkgver}-${_pkgver_patch} +# _dir=${pkgname} +# source=("${_dir}"::"git+https://github.com/ros-gbp/control_toolbox-release.git"#tag=${_tag}) +# sha256sums=('SKIP') -depends=( - ${ros_depends[@]} - tinyxml -) - -_dir=${pkgname} -source=("${_dir}"::"git+https://github.com/ros-gbp/control_toolbox-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="control_toolbox-release-release-melodic-control_toolbox-${pkgver}-${_pkgver_patch}" +source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/control_toolbox-release/archive/release/melodic/control_toolbox/${pkgver}-${_pkgver_patch}.tar.gz") +sha256sums=('adf41cc48636370fc100e01035663240b5328e593eda03980958451292654d3d') 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 } |