diff options
author | acxz | 2020-05-24 12:00:18 -0400 |
---|---|---|
committer | acxz | 2020-05-24 12:00:18 -0400 |
commit | 8100e3324a5416c13f28ff5d667de89fea7276ac (patch) | |
tree | 0f3fa1a946fa9e9e14c790aff81f2cce9d8ab61d | |
parent | 5ec62cb5ce1a8d00261146ab90b2874ba785794a (diff) | |
download | aur-8100e3324a5416c13f28ff5d667de89fea7276ac.tar.gz |
upd to noetic, cmake vars, python
-rw-r--r-- | .SRCINFO | 34 | ||||
-rw-r--r-- | PKGBUILD | 45 |
2 files changed, 36 insertions, 43 deletions
@@ -1,4 +1,4 @@ -pkgbase = ros-melodic-moveit-ros-move-group +pkgbase = ros-noetic-moveit-ros-move-group pkgdesc = ROS - The move_group node for MoveIt. pkgver = 1.0.2 pkgrel = 1 @@ -7,22 +7,22 @@ pkgbase = ros-melodic-moveit-ros-move-group license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-moveit-core - makedepends = ros-melodic-tf - makedepends = ros-melodic-pluginlib - makedepends = ros-melodic-moveit-ros-planning - makedepends = ros-melodic-std-srvs - makedepends = ros-melodic-actionlib - makedepends = ros-melodic-catkin - depends = ros-melodic-moveit-core - depends = ros-melodic-tf - depends = ros-melodic-pluginlib - depends = ros-melodic-moveit-kinematics - depends = ros-melodic-moveit-ros-planning - depends = ros-melodic-std-srvs - depends = ros-melodic-actionlib - source = ros-melodic-moveit-ros-move-group-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-tf + makedepends = ros-noetic-pluginlib + makedepends = ros-noetic-moveit-ros-planning + makedepends = ros-noetic-std-srvs + makedepends = ros-noetic-actionlib + makedepends = ros-noetic-catkin + depends = ros-noetic-moveit-core + depends = ros-noetic-tf + depends = ros-noetic-pluginlib + depends = ros-noetic-moveit-kinematics + depends = ros-noetic-moveit-ros-planning + depends = ros-noetic-std-srvs + depends = ros-noetic-actionlib + source = ros-noetic-moveit-ros-move-group-1.0.2.tar.gz::https://github.com/ros-planning/moveit/archive/1.0.2.tar.gz sha256sums = b8194308c57dbe34bbb729cfccb30d1113af3a54a90a2cfb49482142d1044ea4 -pkgname = ros-melodic-moveit-ros-move-group +pkgname = ros-noetic-moveit-ros-move-group @@ -2,33 +2,33 @@ pkgdesc="ROS - The move_group node for MoveIt." url='https://moveit.ros.org' -pkgname='ros-melodic-moveit-ros-move-group' +pkgname='ros-noetic-moveit-ros-move-group' pkgver='1.0.2' arch=('any') pkgrel=1 license=('BSD') -ros_makedepends=(ros-melodic-moveit-core - ros-melodic-tf - ros-melodic-pluginlib - ros-melodic-moveit-ros-planning - ros-melodic-std-srvs - ros-melodic-actionlib - ros-melodic-catkin) +ros_makedepends=(ros-noetic-moveit-core + ros-noetic-tf + ros-noetic-pluginlib + ros-noetic-moveit-ros-planning + ros-noetic-std-srvs + ros-noetic-actionlib + ros-noetic-catkin) makedepends=('cmake' 'ros-build-tools' ${ros_makedepends[@]}) -ros_depends=(ros-melodic-moveit-core - ros-melodic-tf - ros-melodic-pluginlib - ros-melodic-moveit-kinematics - ros-melodic-moveit-ros-planning - ros-melodic-std-srvs - ros-melodic-actionlib) +ros_depends=(ros-noetic-moveit-core + ros-noetic-tf + ros-noetic-pluginlib + ros-noetic-moveit-kinematics + ros-noetic-moveit-ros-planning + ros-noetic-std-srvs + ros-noetic-actionlib) depends=(${ros_depends[@]}) # Git version (e.g. for debugging) -# _tag=release/melodic/moveit_ros_move_group/${pkgver}-${_pkgver_patch} +# _tag=release/noetic/moveit_ros_move_group/${pkgver}-${_pkgver_patch} # _dir=${pkgname} # source=("${_dir}"::"git+https://github.com/ros-gbp/moveit-release.git"#tag=${_tag}) # sha256sums=('7507264909f49f795664a5443110363bcca00cbcc3380d421af9a586d5b0ede2') @@ -41,24 +41,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 \ - -DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \ - -DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \ - -DPYTHON_BASENAME=-python3.7m \ + -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \ + -DPYTHON_EXECUTABLE=/usr/bin/python \ -DSETUPTOOLS_DEB_LAYOUT=OFF make } |