summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rakowski2017-12-21 23:29:55 +0100
committerTim Rakowski2017-12-21 23:29:55 +0100
commita11e87aceb7bdf89f94bd7d0e6ae0ea4f7edb733 (patch)
tree46c60eaa12d05e920069d6c304a4937438262c06
parentc4b952a99069d31e775e8a8cd605047fb9984b24 (diff)
downloadaur-ros-ardent-pendulum-control.tar.gz
Update to version 0.4.0-1
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD19
2 files changed, 11 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d515b6d27c68..7fbfaef98faa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Dec 19 18:40:39 UTC 2017
+# Thu Dec 21 22:29:51 UTC 2017
pkgbase = ros-ardent-pendulum-control
pkgdesc = ROS - Demonstrates ROS 2s realtime capabilities with a simulated inverted pendulum.
pkgver = 0.4.0
@@ -10,10 +10,10 @@ pkgbase = ros-ardent-pendulum-control
makedepends = cmake
makedepends = ros-build-tools
makedepends = ros-ardent-ament-cmake
+ depends = ros-ardent-pendulum-msgs
depends = ros-ardent-rclcpp
- depends = ros-ardent-rttest
depends = ros-ardent-tlsf-cpp
- depends = ros-ardent-pendulum-msgs
+ depends = ros-ardent-rttest
source = ros-ardent-pendulum-control-0.4.0-0.tar.gz::https://github.com/ros2-gbp/demos-release/archive/release/ardent/pendulum_control/0.4.0-0.tar.gz
sha256sums = 6fa83eeaf1c388bd31ea580b00ecb7c06fa949486d3a66ca892924e24f5d8ea5
diff --git a/PKGBUILD b/PKGBUILD
index 5ceaf76e97f0..d899ad245f19 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,10 +14,10 @@ ros_makedepends=(ros-ardent-ament-cmake)
makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]})
-ros_depends=(ros-ardent-rclcpp
- ros-ardent-rttest
+ros_depends=(ros-ardent-pendulum-msgs
+ ros-ardent-rclcpp
ros-ardent-tlsf-cpp
- ros-ardent-pendulum-msgs)
+ ros-ardent-rttest)
depends=(${ros_depends[@]})
# Git version (e.g. for debugging)
@@ -43,17 +43,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
}