summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO15
-rw-r--r--PKGBUILD24
2 files changed, 13 insertions, 26 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0eb4bfa6832b..6429daca29cb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Mon May 22 17:06:30 UTC 2017
+# Tue Dec 12 20:47:21 UTC 2017
pkgbase = ros-lunar-control-toolbox
pkgdesc = ROS - The control toolbox contains modules that are useful across all controllers.
- pkgver = 1.15.0
+ pkgver = 1.16.0
pkgrel = 1
url = http://ros.org/wiki/control_toolbox
arch = any
@@ -10,14 +10,7 @@ pkgbase = ros-lunar-control-toolbox
makedepends = cmake
makedepends = ros-build-tools
makedepends = ros-lunar-catkin
- makedepends = ros-lunar-roscpp
- makedepends = ros-lunar-control-msgs
- makedepends = ros-lunar-realtime-tools
- makedepends = ros-lunar-cmake-modules
- makedepends = ros-lunar-dynamic-reconfigure
- makedepends = ros-lunar-std-msgs
makedepends = ros-lunar-message-generation
- makedepends = tinyxml
depends = ros-lunar-roscpp
depends = ros-lunar-control-msgs
depends = ros-lunar-realtime-tools
@@ -26,8 +19,8 @@ pkgbase = ros-lunar-control-toolbox
depends = ros-lunar-std-msgs
depends = ros-lunar-message-runtime
depends = tinyxml
- source = ros-lunar-control-toolbox-1.15.0-0.tar.gz::https://github.com/ros-gbp/control_toolbox-release/archive/release/lunar/control_toolbox/1.15.0-0.tar.gz
- sha256sums = f70698efc16544dd14861f5782efe48c47cc2dc98329ba20defa3df508ba0846
+ source = ros-lunar-control-toolbox-1.16.0-0.tar.gz::https://github.com/ros-gbp/control_toolbox-release/archive/release/lunar/control_toolbox/1.16.0-0.tar.gz
+ sha256sums = b38d1b39b0328ba87e4f7c6b777039183c65a8a3007063f84b491a202a0f8610
pkgname = ros-lunar-control-toolbox
diff --git a/PKGBUILD b/PKGBUILD
index c040ba5fd4ff..c10fdfae66af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,23 +4,16 @@ pkgdesc="ROS - The control toolbox contains modules that are useful across all c
url='http://ros.org/wiki/control_toolbox'
pkgname='ros-lunar-control-toolbox'
-pkgver='1.15.0'
+pkgver='1.16.0'
_pkgver_patch=0
arch=('any')
pkgrel=1
license=('BSD')
ros_makedepends=(ros-lunar-catkin
- ros-lunar-roscpp
- ros-lunar-control-msgs
- ros-lunar-realtime-tools
- ros-lunar-cmake-modules
- ros-lunar-dynamic-reconfigure
- ros-lunar-std-msgs
ros-lunar-message-generation)
makedepends=('cmake' 'ros-build-tools'
- ${ros_makedepends[@]}
- tinyxml)
+ ${ros_makedepends[@]})
ros_depends=(ros-lunar-roscpp
ros-lunar-control-msgs
@@ -41,7 +34,7 @@ depends=(${ros_depends[@]}
# Tarball version (faster download)
_dir="control_toolbox-release-release-lunar-control_toolbox-${pkgver}-${_pkgver_patch}"
source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/control_toolbox-release/archive/release/lunar/control_toolbox/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('f70698efc16544dd14861f5782efe48c47cc2dc98329ba20defa3df508ba0846')
+sha256sums=('b38d1b39b0328ba87e4f7c6b777039183c65a8a3007063f84b491a202a0f8610')
build() {
# Use ROS environment variables
@@ -49,14 +42,14 @@ build() {
[ -f /opt/ros/lunar/setup.bash ] && source /opt/ros/lunar/setup.bash
# Create build directory
- [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
- cd ${srcdir}/build
+ [ -d "${srcdir}/build" ] || mkdir "${srcdir}/build"
+ cd "${srcdir}/build"
# Fix Python2/Python3 conflicts
- /usr/share/ros-build-tools/fix-python-scripts.sh -v 2 ${srcdir}/${_dir}
+ /usr/share/ros-build-tools/fix-python-scripts.sh -v 2 "${srcdir}/${_dir}"
# Build project
- cmake ${srcdir}/${_dir} \
+ cmake "${srcdir}/${_dir}" \
-DCMAKE_BUILD_TYPE=Release \
-DCATKIN_BUILD_BINARY_PACKAGE=ON \
-DCMAKE_INSTALL_PREFIX=/opt/ros/lunar \
@@ -64,7 +57,8 @@ build() {
-DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
-DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
-DPYTHON_BASENAME=-python2.7 \
- -DSETUPTOOLS_DEB_LAYOUT=OFF
+ -DSETUPTOOLS_DEB_LAYOUT=OFF \
+ -DCATKIN_ENABLE_TESTING=OFF
make
}