summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rakowski2017-12-21 23:29:56 +0100
committerTim Rakowski2017-12-21 23:29:56 +0100
commit23360ce964bbb9af28ebf0746a3a8aaf42b45e4b (patch)
tree62bbffb904b24fc149a708bbdf9934620d046f55
parentd407d6fd819352394664178ab83ede5ce43ec7fc (diff)
downloadaur-23360ce964bbb9af28ebf0746a3a8aaf42b45e4b.tar.gz
Update to version 0.4.0-1
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD36
2 files changed, 8 insertions, 34 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 216f7f4058f..661925fc012 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Dec 19 18:39:07 UTC 2017
+# Thu Dec 21 22:29:52 UTC 2017
pkgbase = ros-ardent-ament-tools
pkgdesc = ROS - The command line tools for the ament buildsystem.
pkgver = 0.4.0
@@ -9,8 +9,8 @@ pkgbase = ros-ardent-ament-tools
license = Apache License 2.0
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-ardent-ament-package
- makedepends = ros-ardent-osrf-pycommon
+ depends = ros-ardent-ament-package
+ depends = ros-ardent-osrf-pycommon
source = ros-ardent-ament-tools-0.4.0-0.tar.gz::https://github.com/ros2-gbp/ament_tools-release/archive/release/ardent/ament_tools/0.4.0-0.tar.gz
sha256sums = 99292e3bd164d05a29a9b0b21091e5806b7fe4b85b43856991d0b7e8b3caf4a8
diff --git a/PKGBUILD b/PKGBUILD
index 7e067db1443..1466f7d0d5c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,12 +10,12 @@ arch=('any')
pkgrel=1
license=('Apache License 2.0')
-ros_makedepends=(ros-ardent-ament-package
- ros-ardent-osrf-pycommon)
+ros_makedepends=()
makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]})
-ros_depends=()
+ros_depends=(ros-ardent-ament-package
+ ros-ardent-osrf-pycommon)
depends=(${ros_depends[@]})
# Git version (e.g. for debugging)
@@ -29,33 +29,7 @@ _dir="ament_tools-release-release-ardent-ament_tools-${pkgver}-${_pkgver_patch}"
source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros2-gbp/ament_tools-release/archive/release/ardent/ament_tools/${pkgver}-${_pkgver_patch}.tar.gz")
sha256sums=('99292e3bd164d05a29a9b0b21091e5806b7fe4b85b43856991d0b7e8b3caf4a8')
-build() {
- # Use ROS environment variables
- source /usr/share/ros-build-tools/clear-ros-env.sh
- [ -f /opt/ros/ardent/setup.bash ] && source /opt/ros/ardent/setup.bash
-
- # Create build directory
- [ -d "${srcdir}/build" ] || mkdir "${srcdir}/build"
- cd "${srcdir}/build"
-
- # Fix Python2/Python3 conflicts
- /usr/share/ros-build-tools/fix-python-scripts.sh -v 3 "${srcdir}/${_dir}"
-
- # 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
- make
-}
-
package() {
- cd "${srcdir}/build"
- make DESTDIR="${pkgdir}/" install
+ cd "${srcdir}/${_dir}"
+ python setup.py install --root="$pkgdir" --prefix="/opt/ros/ardent" --optimize=1
}