diff options
author | Gonçalo Camelo Neves Pereira | 2018-09-26 13:36:45 +0200 |
---|---|---|
committer | Gonçalo Camelo Neves Pereira | 2018-09-26 13:36:45 +0200 |
commit | 61d4e4c17d6762840cf74560ae9b1c4d2d94eef2 (patch) | |
tree | 4f732053402314287394f1b4846eac6b6ba41aec | |
parent | 0ce3b183b008a512609717f1f771b9973491d9b1 (diff) | |
download | aur-61d4e4c17d6762840cf74560ae9b1c4d2d94eef2.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-rqt-service-caller makedepends = cmake makedepends = ros-build-tools makedepends = ros-melodic-catkin - depends = ros-melodic-rqt-gui - depends = ros-melodic-rosservice depends = ros-melodic-rqt-py-common + depends = ros-melodic-rosservice depends = ros-melodic-rqt-gui-py + depends = ros-melodic-rqt-gui depends = python-rospkg - source = ros-melodic-rqt-service-caller::git+https://github.com/ros-gbp/rqt_service_caller-release.git - sha256sums = SKIP + source = ros-melodic-rqt-service-caller-0.4.8-0.tar.gz::https://github.com/ros-gbp/rqt_service_caller-release/archive/release/melodic/rqt_service_caller/0.4.8-0.tar.gz + sha256sums = 574aa580c11737fc800b058f7cac63a7a7b75d144525d04e89c538716418c1b3 pkgname = ros-melodic-rqt-service-caller @@ -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 - rqt_service_caller provides a GUI plugin for calling arbitrary services." url='http://wiki.ros.org/rqt_service_caller' @@ -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-rqt-py-common + ros-melodic-rosservice + ros-melodic-rqt-gui-py + ros-melodic-rqt-gui) +depends=(${ros_depends[@]} + python-rospkg) -ros_depends=( - ros-melodic-rqt-gui - ros-melodic-rosservice - ros-melodic-rqt-py-common - ros-melodic-rqt-gui-py -) +# Git version (e.g. for debugging) +# _tag=release/melodic/rqt_service_caller/${pkgver}-${_pkgver_patch} +# _dir=${pkgname} +# source=("${_dir}"::"git+https://github.com/ros-gbp/rqt_service_caller-release.git"#tag=${_tag}) +# sha256sums=('SKIP') -depends=( - ${ros_depends[@]} - python-rospkg -) - -_dir=${pkgname} -source=("${_dir}"::"git+https://github.com/ros-gbp/rqt_service_caller-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="rqt_service_caller-release-release-melodic-rqt_service_caller-${pkgver}-${_pkgver_patch}" +source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/rqt_service_caller-release/archive/release/melodic/rqt_service_caller/${pkgver}-${_pkgver_patch}.tar.gz") +sha256sums=('574aa580c11737fc800b058f7cac63a7a7b75d144525d04e89c538716418c1b3') 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 } |