summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rakowski2017-12-21 23:29:56 +0100
committerTim Rakowski2017-12-21 23:29:56 +0100
commitd69515a216e428f74a99b2bed82eb08522b0f0d1 (patch)
tree084884a14da51a222e0145ea4a91ee2c8b4985ff
parent6f3b3f1a9c8f67298832d3ce17320e8ce3827e68 (diff)
downloadaur-ros-ardent-joy.tar.gz
Update to version 2.0.0-1
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD17
2 files changed, 9 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fd485833062e..e259659a5823 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Dec 19 18:42:05 UTC 2017
+# Thu Dec 21 22:29:52 UTC 2017
pkgbase = ros-ardent-joy
pkgdesc = ROS - ROS2 driver for a generic Linux joystick.
pkgver = 2.0.0
@@ -10,8 +10,8 @@ pkgbase = ros-ardent-joy
makedepends = cmake
makedepends = ros-build-tools
makedepends = ros-ardent-ament-cmake
- depends = ros-ardent-rclcpp
depends = ros-ardent-sensor-msgs
+ depends = ros-ardent-rclcpp
source = ros-ardent-joy-2.0.0-0.tar.gz::https://github.com/ros2-gbp/joystick_drivers-release/archive/release/ardent/joy/2.0.0-0.tar.gz
sha256sums = ffed064b6c43cc194d9852f6434498c89322bb71d04e0dfa0920e316fee1c4ca
diff --git a/PKGBUILD b/PKGBUILD
index d76a37e40a78..c5342d97a199 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,8 +14,8 @@ ros_makedepends=(ros-ardent-ament-cmake)
makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]})
-ros_depends=(ros-ardent-rclcpp
- ros-ardent-sensor-msgs)
+ros_depends=(ros-ardent-sensor-msgs
+ ros-ardent-rclcpp)
depends=(${ros_depends[@]})
# Git version (e.g. for debugging)
@@ -41,17 +41,14 @@ build() {
# Fix Python2/Python3 conflicts
/usr/share/ros-build-tools/fix-python-scripts.sh -v 3 "${srcdir}/${_dir}"
+ export PYTHONPATH=/opt/ros/ardent/lib/python3.6/site-packages
+ export AMENT_PREFIX_PATH=/opt/ros/ardent
+
# 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
+ -DBUILD_TESTING=Off \
+ -DCMAKE_INSTALL_PREFIX=/opt/ros/ardent
make
}