diff options
author | Gonçalo Camelo Neves Pereira | 2018-09-08 14:49:30 +0200 |
---|---|---|
committer | Gonçalo Camelo Neves Pereira | 2018-09-08 14:49:30 +0200 |
commit | 7f902ce9db070a62a4029c3ffca90399b824d5c3 (patch) | |
tree | ee52e441c4cca43706f860dc11a71dbca9061e69 | |
parent | a2124dedc295bbcc734f0f7d3be955e50576fb3c (diff) | |
download | aur-7f902ce9db070a62a4029c3ffca90399b824d5c3.tar.gz |
Update!
-rw-r--r-- | .SRCINFO | 18 | ||||
-rw-r--r-- | PKGBUILD | 105 |
2 files changed, 68 insertions, 55 deletions
@@ -7,17 +7,17 @@ pkgbase = ros-melodic-catkin license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = python2-catkin_pkg - makedepends = python2-empy - makedepends = python2 - depends = python2-nose + makedepends = python-catkin_pkg + makedepends = python-empy + makedepends = python + depends = python-empy + depends = python + depends = python-nose + depends = python-catkin_pkg depends = gmock - depends = python2-empy depends = gtest - depends = python2-catkin_pkg - depends = python2 - source = ros-melodic-catkin-0.7.14-0.tar.gz::https://github.com/ros-gbp/catkin-release/archive/release/melodic/catkin/0.7.14-0.tar.gz - sha256sums = 3297a9b5e2afa50c00e87ecc56b181d08fc6a6bbe4e7e71a112402fab03fd445 + source = ros-melodic-catkin::git+https://github.com/ros-gbp/catkin-release.git + sha256sums = SKIP pkgname = ros-melodic-catkin @@ -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 - Low-level build system macros and infrastructure for ROS." url='http://www.ros.org/wiki/catkin' @@ -10,59 +10,72 @@ arch=('any') pkgrel=1 license=('BSD') -ros_makedepends=() -makedepends=('cmake' 'ros-build-tools' - ${ros_makedepends[@]} - python2-catkin_pkg - python2-empy - python2) +ros_makedepends=( +) -ros_depends=() -depends=(${ros_depends[@]} - python2-nose - gmock - python2-empy - gtest - python2-catkin_pkg - python2) +makedepends=( + 'cmake' + 'ros-build-tools' + ${ros_makedepends[@]} + python-catkin_pkg + python-empy + python +) -# Git version (e.g. for debugging) -# _tag=release/melodic/catkin/${pkgver}-${_pkgver_patch} -# _dir=${pkgname} -# source=("${_dir}"::"git+https://github.com/ros-gbp/catkin-release.git"#tag=${_tag}) -# sha256sums=('SKIP') +ros_depends=( +) -# Tarball version (faster download) -_dir="catkin-release-release-melodic-catkin-${pkgver}-${_pkgver_patch}" -source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/catkin-release/archive/release/melodic/catkin/${pkgver}-${_pkgver_patch}.tar.gz") -sha256sums=('3297a9b5e2afa50c00e87ecc56b181d08fc6a6bbe4e7e71a112402fab03fd445') +depends=( + ${ros_depends[@]} + python-empy + python + python-nose + python-catkin_pkg + gmock + gtest +) + +_dir=${pkgname} +source=("${_dir}"::"git+https://github.com/ros-gbp/catkin-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=OFF \ - -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=OFF \ + -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 } |