diff options
author | Gonçalo Camelo Neves Pereira | 2018-09-08 14:56:32 +0200 |
---|---|---|
committer | Gonçalo Camelo Neves Pereira | 2018-09-08 14:56:32 +0200 |
commit | f6dfd1217f52545407938445a3103ad2e729b784 (patch) | |
tree | 2347d30386ba675acb744b4020513ce0c630936e | |
parent | 3dc37330a25600c41107f17ae4abee5a706c2a16 (diff) | |
download | aur-f6dfd1217f52545407938445a3103ad2e729b784.tar.gz |
Update!
-rw-r--r-- | .SRCINFO | 20 | ||||
-rw-r--r-- | PKGBUILD | 113 |
2 files changed, 74 insertions, 59 deletions
@@ -8,21 +8,21 @@ pkgbase = ros-melodic-robot makedepends = cmake makedepends = ros-build-tools makedepends = ros-melodic-catkin - depends = ros-melodic-joint-state-publisher - depends = ros-melodic-ros-base - depends = ros-melodic-urdf-parser-plugin + depends = ros-melodic-executive-smach + depends = ros-melodic-filters depends = ros-melodic-kdl-parser depends = ros-melodic-control-msgs - depends = ros-melodic-robot-state-publisher depends = ros-melodic-urdf + depends = ros-melodic-joint-state-publisher + depends = ros-melodic-ros-base depends = ros-melodic-geometry - depends = ros-melodic-xacro - depends = ros-melodic-executive-smach - depends = ros-melodic-diagnostics depends = ros-melodic-kdl-parser-py - depends = ros-melodic-filters - source = ros-melodic-robot-1.4.1-0.tar.gz::https://github.com/ros-gbp/metapackages-release/archive/release/melodic/robot/1.4.1-0.tar.gz - sha256sums = 4f0efd47cf90e8a1f56602612d73ba032fbb231dec3091f53b795a7d67cbe02b + depends = ros-melodic-diagnostics + depends = ros-melodic-xacro + depends = ros-melodic-urdf-parser-plugin + depends = ros-melodic-robot-state-publisher + source = ros-melodic-robot::git+https://github.com/ros-gbp/metapackages-release.git + sha256sums = SKIP pkgname = ros-melodic-robot @@ -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 - A metapackage which extends ros_base and includes ROS libaries for any robot hardware." url='http://www.ros.org/' @@ -10,62 +10,77 @@ arch=('any') pkgrel=1 license=('BSD') -ros_makedepends=(ros-melodic-catkin) -makedepends=('cmake' 'ros-build-tools' - ${ros_makedepends[@]}) +ros_makedepends=( + ros-melodic-catkin +) -ros_depends=(ros-melodic-joint-state-publisher - ros-melodic-ros-base - ros-melodic-urdf-parser-plugin - ros-melodic-kdl-parser - ros-melodic-control-msgs - ros-melodic-robot-state-publisher - ros-melodic-urdf - ros-melodic-geometry - ros-melodic-xacro - ros-melodic-executive-smach - ros-melodic-diagnostics - ros-melodic-kdl-parser-py - ros-melodic-filters) -depends=(${ros_depends[@]}) +makedepends=( + 'cmake' + 'ros-build-tools' + ${ros_makedepends[@]} +) -# Git version (e.g. for debugging) -# _tag=release/melodic/robot/${pkgver}-${_pkgver_patch} -# _dir=${pkgname} -# source=("${_dir}"::"git+https://github.com/ros-gbp/metapackages-release.git"#tag=${_tag}) -# sha256sums=('SKIP') +ros_depends=( + ros-melodic-executive-smach + ros-melodic-filters + ros-melodic-kdl-parser + ros-melodic-control-msgs + ros-melodic-urdf + ros-melodic-joint-state-publisher + ros-melodic-ros-base + ros-melodic-geometry + ros-melodic-kdl-parser-py + ros-melodic-diagnostics + ros-melodic-xacro + ros-melodic-urdf-parser-plugin + ros-melodic-robot-state-publisher +) -# Tarball version (faster download) -_dir="metapackages-release-release-melodic-robot-${pkgver}-${_pkgver_patch}" -source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/metapackages-release/archive/release/melodic/robot/${pkgver}-${_pkgver_patch}.tar.gz") -sha256sums=('4f0efd47cf90e8a1f56602612d73ba032fbb231dec3091f53b795a7d67cbe02b') +depends=( + ${ros_depends[@]} +) + +_dir=${pkgname} +source=("${_dir}"::"git+https://github.com/ros-gbp/metapackages-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 +} 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 build directory - [ -d ${srcdir}/build ] || mkdir ${srcdir}/build - cd ${srcdir}/build + # 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 2 ${srcdir}/${_dir} + # 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/python2 \ - -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \ - -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \ - -DPYTHON_BASENAME=-python2.7 \ - -DSETUPTOOLS_DEB_LAYOUT=OFF - make + # 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 } package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}/" install + cd "${srcdir}/build" + make DESTDIR="${pkgdir}/" install } |