summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rakowski2017-12-21 23:29:56 +0100
committerTim Rakowski2017-12-21 23:29:56 +0100
commitbd09e60baa5dfe85573bb80d496ab38e68959188 (patch)
treec2a202e3c9f45813a7a574c51553c1cfcd36df66
parent0fdfc397f6e442fbeb5e2b6bc954039868f0179c (diff)
downloadaur-ros-ardent-ros1-bridge.tar.gz
Update to version 0.4.0-1
-rw-r--r--.SRCINFO24
-rw-r--r--PKGBUILD39
2 files changed, 30 insertions, 33 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d1531120bf2..4197364da33 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Dec 19 18:43:52 UTC 2017
+# Thu Dec 21 22:29:53 UTC 2017
pkgbase = ros-ardent-ros1-bridge
pkgdesc = ROS - A simple bridge between ROS 1 and ROS 2.
pkgver = 0.4.0
@@ -9,27 +9,27 @@ pkgbase = ros-ardent-ros1-bridge
license = Apache License 2.0
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-ardent-rmw-implementation-cmake
makedepends = ros-ardent-ament-index-python
+ makedepends = ros-ardent-rmw-implementation-cmake
makedepends = ros-ardent-ament-cmake
makedepends = ros-ardent-rosidl-cmake
makedepends = ros-ardent-rosidl-parser
makedepends = pkg-config
- depends = ros-ardent-std-msgs
- depends = ros-ardent-stereo-msgs
- depends = ros-ardent-trajectory-msgs
depends = ros-ardent-sensor-msgs
- depends = ros-ardent-rclcpp
- depends = ros-ardent-visualization-msgs
depends = ros-ardent-nav-msgs
- depends = ros-ardent-diagnostic-msgs
depends = ros-ardent-rcutils
- depends = ros-ardent-geometry-msgs
depends = ros-ardent-shape-msgs
- depends = ros-ardent-tf2-msgs
- depends = ros-ardent-actionlib-msgs
depends = ros-ardent-std-srvs
- depends = python3-yaml
+ depends = ros-ardent-visualization-msgs
+ depends = ros-ardent-trajectory-msgs
+ depends = ros-ardent-actionlib-msgs
+ depends = ros-ardent-std-msgs
+ depends = ros-ardent-tf2-msgs
+ depends = ros-ardent-diagnostic-msgs
+ depends = ros-ardent-stereo-msgs
+ depends = ros-ardent-geometry-msgs
+ depends = ros-ardent-rclcpp
+ depends = python-yaml
source = ros-ardent-ros1-bridge-0.4.0-0.tar.gz::https://github.com/ros2-gbp/ros1_bridge-release/archive/release/ardent/ros1_bridge/0.4.0-0.tar.gz
sha256sums = cbef6ad7a2bd7e5efb81b57d9c5ebb5b005d0539f45b8b305599e46681a10219
diff --git a/PKGBUILD b/PKGBUILD
index 1977da767fe..afa785befff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,8 +10,8 @@ arch=('any')
pkgrel=1
license=('Apache License 2.0')
-ros_makedepends=(ros-ardent-rmw-implementation-cmake
- ros-ardent-ament-index-python
+ros_makedepends=(ros-ardent-ament-index-python
+ ros-ardent-rmw-implementation-cmake
ros-ardent-ament-cmake
ros-ardent-rosidl-cmake
ros-ardent-rosidl-parser)
@@ -19,22 +19,22 @@ makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]}
pkg-config)
-ros_depends=(ros-ardent-std-msgs
- ros-ardent-stereo-msgs
- ros-ardent-trajectory-msgs
- ros-ardent-sensor-msgs
- ros-ardent-rclcpp
- ros-ardent-visualization-msgs
+ros_depends=(ros-ardent-sensor-msgs
ros-ardent-nav-msgs
- ros-ardent-diagnostic-msgs
ros-ardent-rcutils
- ros-ardent-geometry-msgs
ros-ardent-shape-msgs
- ros-ardent-tf2-msgs
+ ros-ardent-std-srvs
+ ros-ardent-visualization-msgs
+ ros-ardent-trajectory-msgs
ros-ardent-actionlib-msgs
- ros-ardent-std-srvs)
+ ros-ardent-std-msgs
+ ros-ardent-tf2-msgs
+ ros-ardent-diagnostic-msgs
+ ros-ardent-stereo-msgs
+ ros-ardent-geometry-msgs
+ ros-ardent-rclcpp)
depends=(${ros_depends[@]}
- python3-yaml)
+ python-yaml)
# Git version (e.g. for debugging)
# _tag=release/ardent/ros1_bridge/${pkgver}-${_pkgver_patch}
@@ -59,17 +59,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
}