diff options
author | Gonçalo Camelo Neves Pereira | 2018-09-26 13:31:16 +0200 |
---|---|---|
committer | Gonçalo Camelo Neves Pereira | 2018-09-26 13:31:16 +0200 |
commit | 1233dac59702da4eadea747878c6c682c702c3bd (patch) | |
tree | 7895b3c0916a6b27de19c1b4e45e143b056af41f | |
parent | 5e5a08b534fc92046fc958ee6b6b817c54f2f91e (diff) | |
download | aur-1233dac59702da4eadea747878c6c682c702c3bd.tar.gz |
Update
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 101 |
2 files changed, 46 insertions, 61 deletions
@@ -9,11 +9,11 @@ pkgbase = ros-melodic-rosbuild makedepends = ros-build-tools makedepends = ros-melodic-catkin makedepends = pkg-config + depends = ros-melodic-message-runtime depends = ros-melodic-message-generation depends = ros-melodic-catkin - depends = ros-melodic-message-runtime - source = ros-melodic-rosbuild::git+https://github.com/ros-gbp/ros-release.git - sha256sums = SKIP + source = ros-melodic-rosbuild-1.14.4-0.tar.gz::https://github.com/ros-gbp/ros-release/archive/release/melodic/rosbuild/1.14.4-0.tar.gz + sha256sums = eec79bbf61ec0af498d7227f714d7b96e0be0e65a0c00bdb1b46ba779a1d8eab pkgname = ros-melodic-rosbuild @@ -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 - rosbuild contains scripts for managing the CMake-based build system for ROS." url='http://ros.org/wiki/rosbuild' @@ -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[@]} + pkg-config) -makedepends=( - 'cmake' - 'ros-build-tools' - ${ros_makedepends[@]} - pkg-config -) +ros_depends=(ros-melodic-message-runtime + ros-melodic-message-generation + ros-melodic-catkin) +depends=(${ros_depends[@]}) -ros_depends=( - ros-melodic-message-generation - ros-melodic-catkin - ros-melodic-message-runtime -) +# Git version (e.g. for debugging) +# _tag=release/melodic/rosbuild/${pkgver}-${_pkgver_patch} +# _dir=${pkgname} +# source=("${_dir}"::"git+https://github.com/ros-gbp/ros-release.git"#tag=${_tag}) +# sha256sums=('SKIP') -depends=( - ${ros_depends[@]} -) - -_dir=${pkgname} -source=("${_dir}"::"git+https://github.com/ros-gbp/ros-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="ros-release-release-melodic-rosbuild-${pkgver}-${_pkgver_patch}" +source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/ros-release/archive/release/melodic/rosbuild/${pkgver}-${_pkgver_patch}.tar.gz") +sha256sums=('eec79bbf61ec0af498d7227f714d7b96e0be0e65a0c00bdb1b46ba779a1d8eab') 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 } |