diff options
author | acxz | 2020-05-24 12:22:42 -0400 |
---|---|---|
committer | acxz | 2020-05-24 12:22:42 -0400 |
commit | fd312a483cadb7dc056ec130534a946153c4d837 (patch) | |
tree | ccb0478a0f4f2d73cba4ed891366b650b46c1023 | |
parent | 790bd6449006e91f5865c863018ac84e16aec757 (diff) | |
download | aur-fd312a483cadb7dc056ec130534a946153c4d837.tar.gz |
upd to noetic, cmake vars, python
-rw-r--r-- | .SRCINFO | 24 | ||||
-rw-r--r-- | PKGBUILD | 33 |
2 files changed, 25 insertions, 32 deletions
@@ -1,4 +1,4 @@ -pkgbase = ros-melodic-tuw-multi-robot-msgs +pkgbase = ros-noetic-tuw-multi-robot-msgs pkgdesc = ROS - The tuw_multi_robot_msgs package. pkgver = 0.0.13 pkgrel = 1 @@ -7,17 +7,17 @@ pkgbase = ros-melodic-tuw-multi-robot-msgs license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-catkin - makedepends = ros-melodic-message-generation - makedepends = ros-melodic-geometry-msgs - makedepends = ros-melodic-nav-msgs - makedepends = ros-melodic-std-msgs - depends = ros-melodic-message-runtime - depends = ros-melodic-nav-msgs - depends = ros-melodic-geometry-msgs - depends = ros-melodic-std-msgs - source = ros-melodic-tuw-multi-robot-msgs-0.0.13.tar.gz::https://github.com/tuw-robotics/tuw_msgs/archive/0.0.13.tar.gz + makedepends = ros-noetic-catkin + makedepends = ros-noetic-message-generation + makedepends = ros-noetic-geometry-msgs + makedepends = ros-noetic-nav-msgs + makedepends = ros-noetic-std-msgs + depends = ros-noetic-message-runtime + depends = ros-noetic-nav-msgs + depends = ros-noetic-geometry-msgs + depends = ros-noetic-std-msgs + source = ros-noetic-tuw-multi-robot-msgs-0.0.13.tar.gz::https://github.com/tuw-robotics/tuw_msgs/archive/0.0.13.tar.gz sha256sums = b22f12be8014a8855cd179d228ae5312102da4b3d176979f66f13e258cc418b6 -pkgname = ros-melodic-tuw-multi-robot-msgs +pkgname = ros-noetic-tuw-multi-robot-msgs @@ -3,28 +3,28 @@ pkgdesc="ROS - The tuw_multi_robot_msgs package." url='https://wiki.ros.org/tuw_multi_robot_msgs' -pkgname='ros-melodic-tuw-multi-robot-msgs' +pkgname='ros-noetic-tuw-multi-robot-msgs' pkgver='0.0.13' arch=('any') pkgrel=1 license=('BSD') -ros_makedepends=(ros-melodic-catkin - ros-melodic-message-generation - ros-melodic-geometry-msgs - ros-melodic-nav-msgs - ros-melodic-std-msgs) +ros_makedepends=(ros-noetic-catkin + ros-noetic-message-generation + ros-noetic-geometry-msgs + ros-noetic-nav-msgs + ros-noetic-std-msgs) makedepends=('cmake' 'ros-build-tools' ${ros_makedepends[@]}) -ros_depends=(ros-melodic-message-runtime - ros-melodic-nav-msgs - ros-melodic-geometry-msgs - ros-melodic-std-msgs) +ros_depends=(ros-noetic-message-runtime + ros-noetic-nav-msgs + ros-noetic-geometry-msgs + ros-noetic-std-msgs) depends=(${ros_depends[@]}) # Git version (e.g. for debugging) -# _tag=release/melodic/tuw_multi_robot_msgs/${pkgver}-${_pkgver_patch} +# _tag=release/noetic/tuw_multi_robot_msgs/${pkgver}-${_pkgver_patch} # _dir=${pkgname} # source=("${_dir}"::"git+https://github.com/tuw-robotics/tuw_msgs-release.git"#tag=${_tag}) # sha256sums=('SKIP') @@ -37,24 +37,17 @@ sha256sums=('b22f12be8014a8855cd179d228ae5312102da4b3d176979f66f13e258cc418b6') 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 2 ${srcdir}/${_dir} - # Build project cmake ${srcdir}/${_dir} \ - -DCMAKE_BUILD_TYPE=Release \ -DCATKIN_BUILD_BINARY_PACKAGE=ON \ - -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \ + -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \ -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 } |