summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rakowski2017-12-21 23:29:54 +0100
committerTim Rakowski2017-12-21 23:29:54 +0100
commit8613691f6d49be870465df0a17b7c71bf5e7c4e7 (patch)
tree82da7610d69bf7400d2790610a7805c8bceba13f
parenta097781d5447dbf454f64100340d3656d917b4d2 (diff)
downloadaur-ros-ardent-teleop-twist-keyboard.tar.gz
Update to version 2.0.0-1
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD34
2 files changed, 6 insertions, 32 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2868f0c1689d..3c22a079d1f8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Dec 19 18:45:38 UTC 2017
+# Thu Dec 21 22:29:46 UTC 2017
pkgbase = ros-ardent-teleop-twist-keyboard
pkgdesc = ROS - A robot-agnostic teleoperation node to convert keyboard commands to Twist messages.
pkgver = 2.0.0
@@ -9,8 +9,8 @@ pkgbase = ros-ardent-teleop-twist-keyboard
license = BSD License 2.0
makedepends = cmake
makedepends = ros-build-tools
- depends = ros-ardent-geometry-msgs
depends = ros-ardent-rclpy
+ depends = ros-ardent-geometry-msgs
source = ros-ardent-teleop-twist-keyboard-2.0.0-0.tar.gz::https://github.com/ros2-gbp/teleop_twist_keyboard-release/archive/release/ardent/teleop_twist_keyboard/2.0.0-0.tar.gz
sha256sums = 6e85af1a3949be3a30bcc56536cbde6942352ab3fbb6a3e0a5508cde6bada653
diff --git a/PKGBUILD b/PKGBUILD
index 017fe9e5fd42..d85c7e4b2692 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,8 +14,8 @@ ros_makedepends=()
makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]})
-ros_depends=(ros-ardent-geometry-msgs
- ros-ardent-rclpy)
+ros_depends=(ros-ardent-rclpy
+ ros-ardent-geometry-msgs)
depends=(${ros_depends[@]})
# Git version (e.g. for debugging)
@@ -29,33 +29,7 @@ _dir="teleop_twist_keyboard-release-release-ardent-teleop_twist_keyboard-${pkgve
source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros2-gbp/teleop_twist_keyboard-release/archive/release/ardent/teleop_twist_keyboard/${pkgver}-${_pkgver_patch}.tar.gz")
sha256sums=('6e85af1a3949be3a30bcc56536cbde6942352ab3fbb6a3e0a5508cde6bada653')
-build() {
- # Use ROS environment variables
- source /usr/share/ros-build-tools/clear-ros-env.sh
- [ -f /opt/ros/ardent/setup.bash ] && source /opt/ros/ardent/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/ardent \
- -DPYTHON_EXECUTABLE=/usr/bin/python3 \
- -DPYTHON_INCLUDE_DIR=/usr/include/python3.5m \
- -DPYTHON_LIBRARY=/usr/lib/libpython3.5m.so \
- -DPYTHON_BASENAME=.cpython-35m \
- -DSETUPTOOLS_DEB_LAYOUT=OFF \
- -DCATKIN_ENABLE_TESTING=OFF
- make
-}
-
package() {
- cd "${srcdir}/build"
- make DESTDIR="${pkgdir}/" install
+ cd "${srcdir}/${_dir}"
+ python setup.py install --root="$pkgdir" --prefix="/opt/ros/ardent" --optimize=1
}