diff options
author | Gonçalo Camelo Neves Pereira | 2018-09-26 13:33:32 +0200 |
---|---|---|
committer | Gonçalo Camelo Neves Pereira | 2018-09-26 13:33:32 +0200 |
commit | e71de7d6d964790ed37843820155bd9e260f8dcd (patch) | |
tree | 268329857f25c0b9589f0b8d844bfc047387d028 | |
parent | cf9f1821408cfc846ec91ba218a5105404debbe1 (diff) | |
download | aur-e71de7d6d964790ed37843820155bd9e260f8dcd.tar.gz |
Update
-rw-r--r-- | .SRCINFO | 18 | ||||
-rw-r--r-- | PKGBUILD | 113 |
2 files changed, 58 insertions, 73 deletions
@@ -9,20 +9,20 @@ pkgbase = ros-melodic-rospack makedepends = ros-build-tools makedepends = ros-melodic-catkin makedepends = ros-melodic-cmake-modules - makedepends = pkg-config - makedepends = python - makedepends = boost makedepends = tinyxml2 makedepends = gtest + makedepends = pkg-config + makedepends = boost + makedepends = python depends = ros-melodic-ros-environment - depends = pkg-config - depends = python + depends = tinyxml2 + depends = python-rosdep depends = python-catkin_pkg + depends = python depends = boost - depends = python-rosdep - depends = tinyxml2 - source = ros-melodic-rospack::git+https://github.com/ros-gbp/rospack-release.git - sha256sums = SKIP + depends = pkg-config + source = ros-melodic-rospack-2.5.2-0.tar.gz::https://github.com/ros-gbp/rospack-release/archive/release/melodic/rospack/2.5.2-0.tar.gz + sha256sums = 7af1254d1dc1527fd6cfb7c704d55f2037b5cc349b004211328b0360754818cc pkgname = ros-melodic-rospack @@ -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 - ROS Package Tool." url='http://wiki.ros.org/rospack' @@ -10,77 +10,62 @@ arch=('any') pkgrel=1 license=('BSD') -ros_makedepends=( - ros-melodic-catkin - ros-melodic-cmake-modules -) +ros_makedepends=(ros-melodic-catkin + ros-melodic-cmake-modules) +makedepends=('cmake' 'ros-build-tools' + ${ros_makedepends[@]} + tinyxml2 + gtest + pkg-config + boost + python) -makedepends=( - 'cmake' - 'ros-build-tools' - ${ros_makedepends[@]} - pkg-config - python - boost - tinyxml2 - gtest -) +ros_depends=(ros-melodic-ros-environment) +depends=(${ros_depends[@]} + tinyxml2 + python-rosdep + python-catkin_pkg + python + boost + pkg-config) -ros_depends=( - ros-melodic-ros-environment -) +# Git version (e.g. for debugging) +# _tag=release/melodic/rospack/${pkgver}-${_pkgver_patch} +# _dir=${pkgname} +# source=("${_dir}"::"git+https://github.com/ros-gbp/rospack-release.git"#tag=${_tag}) +# sha256sums=('SKIP') -depends=( - ${ros_depends[@]} - pkg-config - python - python-catkin_pkg - boost - python-rosdep - tinyxml2 -) - -_dir=${pkgname} -source=("${_dir}"::"git+https://github.com/ros-gbp/rospack-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="rospack-release-release-melodic-rospack-${pkgver}-${_pkgver_patch}" +source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/rospack-release/archive/release/melodic/rospack/${pkgver}-${_pkgver_patch}.tar.gz") +sha256sums=('7af1254d1dc1527fd6cfb7c704d55f2037b5cc349b004211328b0360754818cc') 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 } |