diff options
| author | Gonçalo Camelo Neves Pereira | 2018-09-08 14:54:48 +0200 |
|---|---|---|
| committer | Gonçalo Camelo Neves Pereira | 2018-09-08 14:54:48 +0200 |
| commit | b5acc621cb0149bf7a89f80ce42b63ff8b178b54 (patch) | |
| tree | 0953089e749adf716b1b84b4dd2a8af39484318e | |
| parent | c3c37054479dad9916d457ad269b61eb2d546412 (diff) | |
| download | aur-b5acc621cb0149bf7a89f80ce42b63ff8b178b54.tar.gz | |
Update!
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 103 |
2 files changed, 62 insertions, 47 deletions
@@ -13,11 +13,11 @@ pkgbase = ros-melodic-nav-msgs makedepends = ros-melodic-geometry-msgs makedepends = ros-melodic-std-msgs depends = ros-melodic-actionlib-msgs - depends = ros-melodic-message-runtime depends = ros-melodic-geometry-msgs + depends = ros-melodic-message-runtime depends = ros-melodic-std-msgs - source = ros-melodic-nav-msgs-1.12.6-0.tar.gz::https://github.com/ros-gbp/common_msgs-release/archive/release/melodic/nav_msgs/1.12.6-0.tar.gz - sha256sums = 96793479de25acdcf228adf9f3662ecf4cc7eb0fcd061d9b27580c7cff2473d3 + source = ros-melodic-nav-msgs::git+https://github.com/ros-gbp/common_msgs-release.git + sha256sums = SKIP pkgname = ros-melodic-nav-msgs @@ -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 - nav_msgs defines the common messages used to interact with the navigation stack." url='http://wiki.ros.org/nav_msgs' @@ -10,57 +10,72 @@ arch=('any') pkgrel=1 license=('BSD') -ros_makedepends=(ros-melodic-actionlib-msgs - ros-melodic-message-generation - ros-melodic-catkin - ros-melodic-geometry-msgs - ros-melodic-std-msgs) -makedepends=('cmake' 'ros-build-tools' - ${ros_makedepends[@]}) +ros_makedepends=( + ros-melodic-actionlib-msgs + ros-melodic-message-generation + ros-melodic-catkin + ros-melodic-geometry-msgs + ros-melodic-std-msgs +) -ros_depends=(ros-melodic-actionlib-msgs - ros-melodic-message-runtime - ros-melodic-geometry-msgs - ros-melodic-std-msgs) -depends=(${ros_depends[@]}) +makedepends=( + 'cmake' + 'ros-build-tools' + ${ros_makedepends[@]} +) -# Git version (e.g. for debugging) -# _tag=release/melodic/nav_msgs/${pkgver}-${_pkgver_patch} -# _dir=${pkgname} -# source=("${_dir}"::"git+https://github.com/ros-gbp/common_msgs-release.git"#tag=${_tag}) -# sha256sums=('SKIP') +ros_depends=( + ros-melodic-actionlib-msgs + ros-melodic-geometry-msgs + ros-melodic-message-runtime + ros-melodic-std-msgs +) -# Tarball version (faster download) -_dir="common_msgs-release-release-melodic-nav_msgs-${pkgver}-${_pkgver_patch}" -source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/common_msgs-release/archive/release/melodic/nav_msgs/${pkgver}-${_pkgver_patch}.tar.gz") -sha256sums=('96793479de25acdcf228adf9f3662ecf4cc7eb0fcd061d9b27580c7cff2473d3') +depends=( + ${ros_depends[@]} +) + +_dir=${pkgname} +source=("${_dir}"::"git+https://github.com/ros-gbp/common_msgs-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 } |