diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 101 |
2 files changed, 46 insertions, 61 deletions
@@ -8,12 +8,12 @@ pkgbase = ros-melodic-common-tutorials makedepends = cmake makedepends = ros-build-tools makedepends = ros-melodic-catkin - depends = ros-melodic-actionlib-tutorials depends = ros-melodic-nodelet-tutorial-math depends = ros-melodic-pluginlib-tutorials + depends = ros-melodic-actionlib-tutorials depends = ros-melodic-turtle-actionlib - source = ros-melodic-common-tutorials::git+https://github.com/ros-gbp/common_tutorials-release.git - sha256sums = SKIP + source = ros-melodic-common-tutorials-0.1.11-0.tar.gz::https://github.com/ros-gbp/common_tutorials-release/archive/release/melodic/common_tutorials/0.1.11-0.tar.gz + sha256sums = a74b72d318a6002dcee5e39472587f5fbe70741e93e71fac242b4ad60b78d9d0 pkgname = ros-melodic-common-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 - Metapackage that contains common tutorials." url='http://ros.org/wiki/common_tutorials' @@ -10,68 +10,53 @@ 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-nodelet-tutorial-math + ros-melodic-pluginlib-tutorials + ros-melodic-actionlib-tutorials + ros-melodic-turtle-actionlib) +depends=(${ros_depends[@]}) -ros_depends=( - ros-melodic-actionlib-tutorials - ros-melodic-nodelet-tutorial-math - ros-melodic-pluginlib-tutorials - ros-melodic-turtle-actionlib -) +# Git version (e.g. for debugging) +# _tag=release/melodic/common_tutorials/${pkgver}-${_pkgver_patch} +# _dir=${pkgname} +# source=("${_dir}"::"git+https://github.com/ros-gbp/common_tutorials-release.git"#tag=${_tag}) +# sha256sums=('SKIP') -depends=( - ${ros_depends[@]} -) - -_dir=${pkgname} -source=("${_dir}"::"git+https://github.com/ros-gbp/common_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="common_tutorials-release-release-melodic-common_tutorials-${pkgver}-${_pkgver_patch}" +source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/common_tutorials-release/archive/release/melodic/common_tutorials/${pkgver}-${_pkgver_patch}.tar.gz") +sha256sums=('a74b72d318a6002dcee5e39472587f5fbe70741e93e71fac242b4ad60b78d9d0') 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 } |