summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rakowski2017-12-21 23:29:56 +0100
committerTim Rakowski2017-12-21 23:29:56 +0100
commit47ea1e03ac72bfafa93237ccac9f5c2a715235e2 (patch)
treeb2a40ccdff50f40e37e91cf335af93aa4202aba7
parent74ab168e22d8edec2fedfe7b5e4af694bae24439 (diff)
downloadaur-47ea1e03ac72bfafa93237ccac9f5c2a715235e2.tar.gz
Update to version 0.4.0-1
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD30
2 files changed, 3 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e1978ab83a5..aa308f1639b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Dec 19 18:44:05 UTC 2017
+# Thu Dec 21 22:29:52 UTC 2017
pkgbase = ros-ardent-ros2run
pkgdesc = ROS - The run command for ROS 2 command line tools.
pkgver = 0.4.0
diff --git a/PKGBUILD b/PKGBUILD
index fd03663b477..084235414ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -29,33 +29,7 @@ _dir="ros2cli-release-release-ardent-ros2run-${pkgver}-${_pkgver_patch}"
source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros2-gbp/ros2cli-release/archive/release/ardent/ros2run/${pkgver}-${_pkgver_patch}.tar.gz")
sha256sums=('6c1960d13af256f4052a9b1fa8d98225e1b346c556c2f8dda22be5c4359cfcee')
-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
}