summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGonçalo Camelo Neves Pereira2019-01-09 19:21:10 +0100
committerGonçalo Camelo Neves Pereira2019-01-09 19:21:10 +0100
commit08c1c935d45ca4289302882e53848b82f3800b19 (patch)
tree88158f34715d45970840ed19d5ce2e7b3667c153
parent973910eecf833412b01b9fa0c5f786d67a8d19d7 (diff)
downloadaur-08c1c935d45ca4289302882e53848b82f3800b19.tar.gz
New Version
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD86
2 files changed, 48 insertions, 44 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 48708f4f397..ef5c3a941ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,13 +7,13 @@ pkgbase = ros-melodic-diagnostic-common-diagnostics
license = BSD
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-melodic-diagnostic-updater
makedepends = ros-melodic-rostest
- makedepends = ros-melodic-catkin
makedepends = ros-melodic-rospy
- depends = ros-melodic-diagnostic-updater
+ makedepends = ros-melodic-catkin
+ makedepends = ros-melodic-diagnostic-updater
depends = ros-melodic-tf
depends = ros-melodic-rospy
+ depends = ros-melodic-diagnostic-updater
depends = python-psutil
depends = hddtemp
source = ros-melodic-diagnostic-common-diagnostics-1.9.3-0.tar.gz::https://github.com/ros-gbp/diagnostics-release/archive/release/melodic/diagnostic_common_diagnostics/1.9.3-0.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index df29aa36032..e7913cb5e63 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
-# Script generated with import_catkin_packages.py
-# For more information: https://github.com/bchretien/arch-ros-stacks
+# Script generated with import_catkin_packages.py.
+# For more information: https://github.com/bchretien/arch-ros-stacks.
pkgdesc="ROS - diagnostic_common_diagnostics."
url='http://ros.org/wiki/diagnostic_common_diagnostics'
@@ -10,57 +10,61 @@ arch=('any')
pkgrel=1
license=('BSD')
-ros_makedepends=(ros-melodic-diagnostic-updater
- ros-melodic-rostest
- ros-melodic-catkin
- ros-melodic-rospy)
-makedepends=('cmake' 'ros-build-tools'
- ${ros_makedepends[@]})
+ros_makedepends=(
+ ros-melodic-rostest
+ ros-melodic-rospy
+ ros-melodic-catkin
+ ros-melodic-diagnostic-updater
+)
-ros_depends=(ros-melodic-diagnostic-updater
- ros-melodic-tf
- ros-melodic-rospy)
-depends=(${ros_depends[@]}
- python-psutil
- hddtemp)
+makedepends=(
+ 'cmake'
+ 'ros-build-tools'
+ ${ros_makedepends[@]}
+)
-# Git version (e.g. for debugging)
-# _tag=release/melodic/diagnostic_common_diagnostics/${pkgver}-${_pkgver_patch}
-# _dir=${pkgname}
-# source=("${_dir}"::"git+https://github.com/ros-gbp/diagnostics-release.git"#tag=${_tag})
-# sha256sums=('SKIP')
+ros_depends=(
+ ros-melodic-tf
+ ros-melodic-rospy
+ ros-melodic-diagnostic-updater
+)
+
+depends=(
+ ${ros_depends[@]}
+ python-psutil
+ hddtemp
+)
-# Tarball version (faster download)
_dir="diagnostics-release-release-melodic-diagnostic_common_diagnostics-${pkgver}-${_pkgver_patch}"
source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/diagnostics-release/archive/release/melodic/diagnostic_common_diagnostics/${pkgver}-${_pkgver_patch}.tar.gz")
sha256sums=('e9729593c5e73825e769d670d78ba809db061ffb344132201020eae878c1359c')
build() {
- # Use ROS environment variables
- source /usr/share/ros-build-tools/clear-ros-env.sh
- [ -f /opt/ros/melodic/setup.bash ] && source /opt/ros/melodic/setup.bash
+ # Use ROS environment variables.
+ source /usr/share/ros-build-tools/clear-ros-env.sh
+ [ -f /opt/ros/melodic/setup.bash ] && source /opt/ros/melodic/setup.bash
- # Create build directory
- [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
- cd ${srcdir}/build
+ # Create the 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}
+ # 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/melodic \
- -DPYTHON_EXECUTABLE=/usr/bin/python3 \
- -DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \
- -DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \
- -DPYTHON_BASENAME=.cpython-37m \
- -DSETUPTOOLS_DEB_LAYOUT=OFF
- make
+ # Build the project.
+ cmake ${srcdir}/${_dir} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCATKIN_BUILD_BINARY_PACKAGE=ON \
+ -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
+ -DPYTHON_EXECUTABLE=/usr/bin/python3 \
+ -DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \
+ -DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \
+ -DPYTHON_BASENAME=.cpython-37m \
+ -DSETUPTOOLS_DEB_LAYOUT=OFF
+ make
}
package() {
- cd "${srcdir}/build"
- make DESTDIR="${pkgdir}/" install
+ cd "${srcdir}/build"
+ make DESTDIR="${pkgdir}/" install
}