summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rakowski2017-12-21 23:29:54 +0100
committerTim Rakowski2017-12-21 23:29:54 +0100
commitf2391784a4d9ad8473e9caa6ee2290f5d2d5609b (patch)
treee34cb18ee1ca10d8a24e45a8902284a944783a0f
parentc8ad780e3b7cf00c3bea7d5535e70c2ebd16d5ef (diff)
downloadaur-ros-ardent-ament-cmake-cpplint.tar.gz
Update to version 0.4.0-1
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD19
2 files changed, 11 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6ddd754aa6ff..04c1d95fae00 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Dec 19 18:26:39 UTC 2017
+# Thu Dec 21 22:29:47 UTC 2017
pkgbase = ros-ardent-ament-cmake-cpplint
pkgdesc = ROS - The CMake API for ament_cpplint to lint C / C++ code using cpplint.
pkgver = 0.4.0
@@ -10,7 +10,8 @@ pkgbase = ros-ardent-ament-cmake-cpplint
makedepends = cmake
makedepends = ros-build-tools
makedepends = ros-ardent-ament-cmake-core
- makedepends = ros-ardent-ament-cmake-test
+ depends = ros-ardent-ament-cpplint
+ depends = ros-ardent-ament-cmake-test
source = ros-ardent-ament-cmake-cpplint-0.4.0-0.tar.gz::https://github.com/ros2-gbp/ament_lint-release/archive/release/ardent/ament_cmake_cpplint/0.4.0-0.tar.gz
sha256sums = fba643432efed0077ff69919800d69568fa64a5bc5ba31fd0a7fce51f3d89873
diff --git a/PKGBUILD b/PKGBUILD
index 120b9f43f2f4..d6058cae3766 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,12 +10,12 @@ arch=('any')
pkgrel=1
license=('Apache License 2.0')
-ros_makedepends=(ros-ardent-ament-cmake-core
- ros-ardent-ament-cmake-test)
+ros_makedepends=(ros-ardent-ament-cmake-core)
makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]})
-ros_depends=()
+ros_depends=(ros-ardent-ament-cpplint
+ ros-ardent-ament-cmake-test)
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
}