diff options
author | Gonçalo Camelo Neves Pereira | 2018-09-26 13:24:27 +0200 |
---|---|---|
committer | Gonçalo Camelo Neves Pereira | 2018-09-26 13:24:27 +0200 |
commit | 20240a1ea56a87d008c579b6085977c9f58b5e86 (patch) | |
tree | 34f6f8d59f96cd290492bb46f8f597c91b24bf8b | |
parent | 5ab6e07d5b6a0f777f3f745e8a9db186bb7515fb (diff) | |
download | aur-20240a1ea56a87d008c579b6085977c9f58b5e86.tar.gz |
Update
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 103 |
2 files changed, 48 insertions, 63 deletions
@@ -8,13 +8,13 @@ pkgbase = ros-melodic-diagnostics makedepends = cmake makedepends = ros-build-tools makedepends = ros-melodic-catkin - depends = ros-melodic-diagnostic-analysis depends = ros-melodic-diagnostic-common-diagnostics - depends = ros-melodic-diagnostic-updater depends = ros-melodic-self-test + depends = ros-melodic-diagnostic-updater depends = ros-melodic-diagnostic-aggregator - source = ros-melodic-diagnostics::git+https://github.com/ros-gbp/diagnostics-release.git - sha256sums = SKIP + depends = ros-melodic-diagnostic-analysis + source = ros-melodic-diagnostics-1.9.3-0.tar.gz::https://github.com/ros-gbp/diagnostics-release/archive/release/melodic/diagnostics/1.9.3-0.tar.gz + sha256sums = dec737018e36952a217efb3fda54489da280470d5230f4a5fa282027317cc03f pkgname = ros-melodic-diagnostics @@ -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 - diagnostics." url='http://www.ros.org/wiki/diagnostics' @@ -10,69 +10,54 @@ arch=('any') pkgrel=1 license=('BSD') -ros_makedepends=( - ros-melodic-catkin -) +ros_makedepends=(ros-melodic-catkin) +makedepends=('cmake' 'ros-build-tools' + ${ros_makedepends[@]}) -makedepends=( - 'cmake' - 'ros-build-tools' - ${ros_makedepends[@]} -) +ros_depends=(ros-melodic-diagnostic-common-diagnostics + ros-melodic-self-test + ros-melodic-diagnostic-updater + ros-melodic-diagnostic-aggregator + ros-melodic-diagnostic-analysis) +depends=(${ros_depends[@]}) -ros_depends=( - ros-melodic-diagnostic-analysis - ros-melodic-diagnostic-common-diagnostics - ros-melodic-diagnostic-updater - ros-melodic-self-test - ros-melodic-diagnostic-aggregator -) +# Git version (e.g. for debugging) +# _tag=release/melodic/diagnostics/${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-diagnostics-${pkgver}-${_pkgver_patch}" +source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/diagnostics-release/archive/release/melodic/diagnostics/${pkgver}-${_pkgver_patch}.tar.gz") +sha256sums=('dec737018e36952a217efb3fda54489da280470d5230f4a5fa282027317cc03f') 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 - - # 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 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 + # 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 + + # 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/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 } |