diff options
author | Gonçalo Camelo Neves Pereira | 2018-09-26 13:38:46 +0200 |
---|---|---|
committer | Gonçalo Camelo Neves Pereira | 2018-09-26 13:38:46 +0200 |
commit | 6b774247a5cd6e0b724fe96ff53860c2e37ee535 (patch) | |
tree | 3d32dd7de77bba0fe8d7bf489aeac526320dd693 | |
parent | ed5c1bafdafa33aff96c12509d035014e5abe9d0 (diff) | |
download | aur-6b774247a5cd6e0b724fe96ff53860c2e37ee535.tar.gz |
Update
-rw-r--r-- | .SRCINFO | 16 | ||||
-rw-r--r-- | PKGBUILD | 109 |
2 files changed, 55 insertions, 70 deletions
@@ -7,20 +7,20 @@ pkgbase = ros-melodic-test-diagnostic-aggregator license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-diagnostic-msgs makedepends = ros-melodic-pluginlib - makedepends = ros-melodic-catkin - makedepends = ros-melodic-rospy + makedepends = ros-melodic-diagnostic-aggregator makedepends = ros-melodic-rostest makedepends = ros-melodic-roscpp - makedepends = ros-melodic-diagnostic-aggregator + makedepends = ros-melodic-catkin + makedepends = ros-melodic-diagnostic-msgs + makedepends = ros-melodic-rospy depends = ros-melodic-diagnostic-msgs depends = ros-melodic-pluginlib - depends = ros-melodic-rospy - depends = ros-melodic-roscpp depends = ros-melodic-diagnostic-aggregator - source = ros-melodic-test-diagnostic-aggregator::git+https://github.com/ros-gbp/diagnostics-release.git - sha256sums = SKIP + depends = ros-melodic-roscpp + depends = ros-melodic-rospy + source = ros-melodic-test-diagnostic-aggregator-1.9.3-0.tar.gz::https://github.com/ros-gbp/diagnostics-release/archive/release/melodic/test_diagnostic_aggregator/1.9.3-0.tar.gz + sha256sums = 4c49680ea5fe2d6e4c792d09848623c3b0206126ad171c4b4dd61f400c9abfe3 pkgname = ros-melodic-test-diagnostic-aggregator @@ -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 - Basic diagnostic_aggregator tests are in the." url='http://ros.org/wiki/test_diagnostic_aggregator' @@ -10,75 +10,60 @@ arch=('any') pkgrel=1 license=('BSD') -ros_makedepends=( - ros-melodic-diagnostic-msgs - ros-melodic-pluginlib - ros-melodic-catkin - ros-melodic-rospy - ros-melodic-rostest - ros-melodic-roscpp - ros-melodic-diagnostic-aggregator -) +ros_makedepends=(ros-melodic-pluginlib + ros-melodic-diagnostic-aggregator + ros-melodic-rostest + ros-melodic-roscpp + ros-melodic-catkin + ros-melodic-diagnostic-msgs + ros-melodic-rospy) +makedepends=('cmake' 'ros-build-tools' + ${ros_makedepends[@]}) -makedepends=( - 'cmake' - 'ros-build-tools' - ${ros_makedepends[@]} -) +ros_depends=(ros-melodic-diagnostic-msgs + ros-melodic-pluginlib + ros-melodic-diagnostic-aggregator + ros-melodic-roscpp + ros-melodic-rospy) +depends=(${ros_depends[@]}) -ros_depends=( - ros-melodic-diagnostic-msgs - ros-melodic-pluginlib - ros-melodic-rospy - ros-melodic-roscpp - ros-melodic-diagnostic-aggregator -) +# Git version (e.g. for debugging) +# _tag=release/melodic/test_diagnostic_aggregator/${pkgver}-${_pkgver_patch} +# _dir=${pkgname} +# source=("${_dir}"::"git+https://github.com/ros-gbp/diagnostics-release.git"#tag=${_tag}) +# sha256sums=('SKIP') -depends=( - ${ros_depends[@]} -) - -_dir=${pkgname} -source=("${_dir}"::"git+https://github.com/ros-gbp/diagnostics-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="diagnostics-release-release-melodic-test_diagnostic_aggregator-${pkgver}-${_pkgver_patch}" +source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/diagnostics-release/archive/release/melodic/test_diagnostic_aggregator/${pkgver}-${_pkgver_patch}.tar.gz") +sha256sums=('4c49680ea5fe2d6e4c792d09848623c3b0206126ad171c4b4dd61f400c9abfe3') 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 } |