diff options
author | Gonçalo Camelo Neves Pereira | 2018-09-26 13:37:26 +0200 |
---|---|---|
committer | Gonçalo Camelo Neves Pereira | 2018-09-26 13:37:26 +0200 |
commit | ae910202a5ab8d844330793d122fae55ef0bf4a8 (patch) | |
tree | 99bfb20215b9c35d96818d736be00813fad450bb | |
parent | 3aa151fa35d23572f7298dca85767a6f972114bf (diff) | |
download | aur-ae910202a5ab8d844330793d122fae55ef0bf4a8.tar.gz |
Update
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 101 |
2 files changed, 45 insertions, 60 deletions
@@ -12,8 +12,8 @@ pkgbase = ros-melodic-rviz-plugin-tutorials makedepends = qt5-base depends = ros-melodic-rviz depends = qt5-base - source = ros-melodic-rviz-plugin-tutorials::git+https://github.com/ros-gbp/visualization_tutorials-release.git - sha256sums = SKIP + source = ros-melodic-rviz-plugin-tutorials-0.10.3-0.tar.gz::https://github.com/ros-gbp/visualization_tutorials-release/archive/release/melodic/rviz_plugin_tutorials/0.10.3-0.tar.gz + sha256sums = 88f1ec8a199451ff130c3c4a4375c5c82f2989e6cffec0986ce980e3f25335e0 pkgname = ros-melodic-rviz-plugin-tutorials @@ -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 - Tutorials showing how to write plugins for RViz." url='http://ros.org/wiki/rviz_plugin_tutorials' @@ -10,68 +10,53 @@ arch=('any') pkgrel=1 license=('BSD') -ros_makedepends=( - ros-melodic-rviz - ros-melodic-catkin -) +ros_makedepends=(ros-melodic-rviz + ros-melodic-catkin) +makedepends=('cmake' 'ros-build-tools' + ${ros_makedepends[@]} + qt5-base) -makedepends=( - 'cmake' - 'ros-build-tools' - ${ros_makedepends[@]} - qt5-base -) +ros_depends=(ros-melodic-rviz) +depends=(${ros_depends[@]} + qt5-base) -ros_depends=( - ros-melodic-rviz -) +# Git version (e.g. for debugging) +# _tag=release/melodic/rviz_plugin_tutorials/${pkgver}-${_pkgver_patch} +# _dir=${pkgname} +# source=("${_dir}"::"git+https://github.com/ros-gbp/visualization_tutorials-release.git"#tag=${_tag}) +# sha256sums=('SKIP') -depends=( - ${ros_depends[@]} - qt5-base -) - -_dir=${pkgname} -source=("${_dir}"::"git+https://github.com/ros-gbp/visualization_tutorials-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="visualization_tutorials-release-release-melodic-rviz_plugin_tutorials-${pkgver}-${_pkgver_patch}" +source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/visualization_tutorials-release/archive/release/melodic/rviz_plugin_tutorials/${pkgver}-${_pkgver_patch}.tar.gz") +sha256sums=('88f1ec8a199451ff130c3c4a4375c5c82f2989e6cffec0986ce980e3f25335e0') 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 } |