diff options
author | acxz | 2020-05-24 12:01:16 -0400 |
---|---|---|
committer | acxz | 2020-05-24 12:01:16 -0400 |
commit | 4af3e3da82d3c79d7e9ef9edb3f8b32ac125c0b7 (patch) | |
tree | 278a17165e6c1df35ec84f7e100719e02273d66b | |
parent | 5f681bcf0fff97b666fbb741cf32c713d500ac88 (diff) | |
download | aur-4af3e3da82d3c79d7e9ef9edb3f8b32ac125c0b7.tar.gz |
upd to noetic, cmake vars, python
-rw-r--r-- | .SRCINFO | 28 | ||||
-rw-r--r-- | PKGBUILD | 36 |
2 files changed, 30 insertions, 34 deletions
@@ -1,4 +1,4 @@ -pkgbase = ros-melodic-moveit-simple-controller-manager +pkgbase = ros-noetic-moveit-simple-controller-manager pkgdesc = ROS - A generic, simple controller manager plugin for MoveIt. pkgver = 1.0.2 pkgrel = 2 @@ -11,19 +11,19 @@ pkgbase = ros-melodic-moveit-simple-controller-manager license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-moveit-core - makedepends = ros-melodic-roscpp - makedepends = ros-melodic-pluginlib - makedepends = ros-melodic-control-msgs - makedepends = ros-melodic-actionlib - makedepends = ros-melodic-catkin - depends = ros-melodic-pluginlib - depends = ros-melodic-control-msgs - depends = ros-melodic-moveit-core - depends = ros-melodic-actionlib - depends = ros-melodic-roscpp - source = ros-melodic-moveit-simple-controller-manager-1.0.2.tar.gz::https://github.com/ros-planning/moveit/archive/1.0.2.tar.gz + makedepends = ros-noetic-moveit-core + makedepends = ros-noetic-roscpp + makedepends = ros-noetic-pluginlib + makedepends = ros-noetic-control-msgs + makedepends = ros-noetic-actionlib + makedepends = ros-noetic-catkin + depends = ros-noetic-pluginlib + depends = ros-noetic-control-msgs + depends = ros-noetic-moveit-core + depends = ros-noetic-actionlib + depends = ros-noetic-roscpp + source = ros-noetic-moveit-simple-controller-manager-1.0.2.tar.gz::https://github.com/ros-planning/moveit/archive/1.0.2.tar.gz sha256sums = b8194308c57dbe34bbb729cfccb30d1113af3a54a90a2cfb49482142d1044ea4 -pkgname = ros-melodic-moveit-simple-controller-manager +pkgname = ros-noetic-moveit-simple-controller-manager @@ -2,30 +2,30 @@ pkgdesc="ROS - A generic, simple controller manager plugin for MoveIt." url='https://moveit.ros.org' -pkgname='ros-melodic-moveit-simple-controller-manager' +pkgname='ros-noetic-moveit-simple-controller-manager' pkgver='1.0.2' arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h') pkgrel=2 license=('BSD') -ros_makedepends=(ros-melodic-moveit-core - ros-melodic-roscpp - ros-melodic-pluginlib - ros-melodic-control-msgs - ros-melodic-actionlib - ros-melodic-catkin) +ros_makedepends=(ros-noetic-moveit-core + ros-noetic-roscpp + ros-noetic-pluginlib + ros-noetic-control-msgs + ros-noetic-actionlib + ros-noetic-catkin) makedepends=('cmake' 'ros-build-tools' ${ros_makedepends[@]}) -ros_depends=(ros-melodic-pluginlib - ros-melodic-control-msgs - ros-melodic-moveit-core - ros-melodic-actionlib - ros-melodic-roscpp) +ros_depends=(ros-noetic-pluginlib + ros-noetic-control-msgs + ros-noetic-moveit-core + ros-noetic-actionlib + ros-noetic-roscpp) depends=(${ros_depends[@]}) # Git version (e.g. for debugging) -# _tag=release/melodic/moveit_simple_controller_manager/${pkgver}-${_pkgver_patch} +# _tag=release/noetic/moveit_simple_controller_manager/${pkgver}-${_pkgver_patch} # _dir=${pkgname} # source=("${_dir}"::"git+https://github.com/ros-gbp/moveit-release.git"#tag=${_tag}) # sha256sums=('db9c403189e6cc2ee76b0888ea0e1b3708b5791142e4ef90254469e5e6557e8a') @@ -38,21 +38,17 @@ sha256sums=('b8194308c57dbe34bbb729cfccb30d1113af3a54a90a2cfb49482142d1044ea4') 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 + [ -f /opt/ros/noetic/setup.bash ] && source /opt/ros/noetic/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 \ + -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \ + -DPYTHON_EXECUTABLE=/usr/bin/python \ -DSETUPTOOLS_DEB_LAYOUT=OFF make } |