summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rakowski2017-12-21 23:29:55 +0100
committerTim Rakowski2017-12-21 23:29:55 +0100
commit3112f7ca015227d09aabcd51865cf50ab24cd1e0 (patch)
tree36eff39a903293f77e8b981fead862b50f2f0b7a
parentb99ccbf01d97dc482c40a973c0e42aacb0f3fc00 (diff)
downloadaur-ros-ardent-lifecycle.tar.gz
Update to version 0.4.0-1
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD21
2 files changed, 12 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3650b7fed62..b5fc9edb400 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Dec 19 18:40:34 UTC 2017
+# Thu Dec 21 22:29:47 UTC 2017
pkgbase = ros-ardent-lifecycle
pkgdesc = ROS - Package containing demos for lifecycle implementation.
pkgver = 0.4.0
@@ -10,10 +10,10 @@ pkgbase = ros-ardent-lifecycle
makedepends = cmake
makedepends = ros-build-tools
makedepends = ros-ardent-ament-cmake
- depends = ros-ardent-std-msgs
depends = ros-ardent-rclcpp-lifecycle
- depends = ros-ardent-ros2run
+ depends = ros-ardent-std-msgs
depends = ros-ardent-lifecycle-msgs
+ depends = ros-ardent-ros2run
source = ros-ardent-lifecycle-0.4.0-0.tar.gz::https://github.com/ros2-gbp/demos-release/archive/release/ardent/lifecycle/0.4.0-0.tar.gz
sha256sums = 5f5a8774e01916b54969ab1d3124c52d7e4576938fa65004c4a950f4a407f793
diff --git a/PKGBUILD b/PKGBUILD
index 3212cea1751..14f25173069 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-std-msgs
- ros-ardent-rclcpp-lifecycle
- ros-ardent-ros2run
- ros-ardent-lifecycle-msgs)
+ros_depends=(ros-ardent-rclcpp-lifecycle
+ ros-ardent-std-msgs
+ ros-ardent-lifecycle-msgs
+ ros-ardent-ros2run)
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
}