diff options
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 27 |
2 files changed, 18 insertions, 21 deletions
@@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Tue Dec 19 18:40:02 UTC 2017 +# Thu Dec 21 22:29:49 UTC 2017 pkgbase = ros-ardent-composition pkgdesc = ROS - Examples for composing multiple nodes in a single process. pkgver = 0.4.0 @@ -9,16 +9,16 @@ pkgbase = ros-ardent-composition license = Apache License 2.0 makedepends = cmake makedepends = ros-build-tools - makedepends = ros-ardent-ament-cmake makedepends = ros-ardent-rosidl-cmake + makedepends = ros-ardent-ament-cmake makedepends = ros-ardent-rosidl-default-generators - depends = ros-ardent-std-msgs + depends = ros-ardent-rosidl-default-runtime + depends = ros-ardent-rclcpp depends = ros-ardent-ament-index-cpp + depends = ros-ardent-example-interfaces depends = ros-ardent-class-loader - depends = ros-ardent-rclcpp + depends = ros-ardent-std-msgs depends = ros-ardent-rcutils - depends = ros-ardent-rosidl-default-runtime - depends = ros-ardent-example-interfaces source = ros-ardent-composition-0.4.0-0.tar.gz::https://github.com/ros2-gbp/demos-release/archive/release/ardent/composition/0.4.0-0.tar.gz sha256sums = f8e3cc005d9403bb34768fd9e597328577966d0f567241ccb92ac4a78ae0e952 @@ -10,19 +10,19 @@ arch=('any') pkgrel=1 license=('Apache License 2.0') -ros_makedepends=(ros-ardent-ament-cmake - ros-ardent-rosidl-cmake +ros_makedepends=(ros-ardent-rosidl-cmake + ros-ardent-ament-cmake ros-ardent-rosidl-default-generators) makedepends=('cmake' 'ros-build-tools' ${ros_makedepends[@]}) -ros_depends=(ros-ardent-std-msgs +ros_depends=(ros-ardent-rosidl-default-runtime + ros-ardent-rclcpp ros-ardent-ament-index-cpp + ros-ardent-example-interfaces ros-ardent-class-loader - ros-ardent-rclcpp - ros-ardent-rcutils - ros-ardent-rosidl-default-runtime - ros-ardent-example-interfaces) + ros-ardent-std-msgs + ros-ardent-rcutils) depends=(${ros_depends[@]}) # Git version (e.g. for debugging) @@ -48,17 +48,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 } |