diff options
author | Gonçalo Camelo Neves Pereira | 2018-09-26 13:25:19 +0200 |
---|---|---|
committer | Gonçalo Camelo Neves Pereira | 2018-09-26 13:25:19 +0200 |
commit | b5b44c72d42c7a1566ca3e8f24c9c2c5c0b15126 (patch) | |
tree | d2b3cb8f9d4c97e7758ab4772f2b167c4c881a8a | |
parent | 8061526a4ce1ae2485f4aef8de10eb2c13a4556a (diff) | |
download | aur-b5b44c72d42c7a1566ca3e8f24c9c2c5c0b15126.tar.gz |
Update
-rw-r--r-- | .SRCINFO | 28 | ||||
-rw-r--r-- | PKGBUILD | 135 |
2 files changed, 74 insertions, 89 deletions
@@ -7,33 +7,33 @@ pkgbase = ros-melodic-gazebo-ros license = Apache 2.0 makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-std-srvs makedepends = ros-melodic-tf - makedepends = ros-melodic-catkin - makedepends = ros-melodic-cmake-modules + makedepends = ros-melodic-std-msgs + makedepends = ros-melodic-gazebo-msgs makedepends = ros-melodic-dynamic-reconfigure - makedepends = ros-melodic-geometry-msgs + makedepends = ros-melodic-roscpp + makedepends = ros-melodic-catkin makedepends = ros-melodic-roslib + makedepends = ros-melodic-std-srvs + makedepends = ros-melodic-geometry-msgs makedepends = ros-melodic-rosgraph-msgs + makedepends = ros-melodic-cmake-modules makedepends = ros-melodic-gazebo-dev - makedepends = ros-melodic-roscpp - makedepends = ros-melodic-gazebo-msgs - makedepends = ros-melodic-std-msgs makedepends = tinyxml - depends = ros-melodic-std-srvs depends = ros-melodic-tf - depends = ros-melodic-geometry-msgs + depends = ros-melodic-std-msgs + depends = ros-melodic-gazebo-msgs depends = ros-melodic-dynamic-reconfigure + depends = ros-melodic-roscpp depends = ros-melodic-roslib + depends = ros-melodic-std-srvs + depends = ros-melodic-geometry-msgs depends = ros-melodic-rosgraph-msgs depends = ros-melodic-gazebo-dev - depends = ros-melodic-roscpp - depends = ros-melodic-gazebo-msgs - depends = ros-melodic-std-msgs depends = tinyxml depends = python - source = ros-melodic-gazebo-ros::git+https://github.com/ros-gbp/gazebo_ros_pkgs-release.git - sha256sums = SKIP + source = ros-melodic-gazebo-ros-2.8.4-0.tar.gz::https://github.com/ros-gbp/gazebo_ros_pkgs-release/archive/release/melodic/gazebo_ros/2.8.4-0.tar.gz + sha256sums = fde5c96dfbdfcd8550ae4b731d199348b50955157f0bc114f754c5a55170ca8a pkgname = ros-melodic-gazebo-ros @@ -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 - Provides ROS plugins that offer message and service publishers for interfacing with Gazebo through ROS." url='http://gazebosim.org/tutorials?cat=connect_ros' @@ -10,88 +10,73 @@ arch=('any') pkgrel=1 license=('Apache 2.0') -ros_makedepends=( - ros-melodic-std-srvs - ros-melodic-tf - ros-melodic-catkin - ros-melodic-cmake-modules - ros-melodic-dynamic-reconfigure - ros-melodic-geometry-msgs - ros-melodic-roslib - ros-melodic-rosgraph-msgs - ros-melodic-gazebo-dev - ros-melodic-roscpp - ros-melodic-gazebo-msgs - ros-melodic-std-msgs -) +ros_makedepends=(ros-melodic-tf + ros-melodic-std-msgs + ros-melodic-gazebo-msgs + ros-melodic-dynamic-reconfigure + ros-melodic-roscpp + ros-melodic-catkin + ros-melodic-roslib + ros-melodic-std-srvs + ros-melodic-geometry-msgs + ros-melodic-rosgraph-msgs + ros-melodic-cmake-modules + ros-melodic-gazebo-dev) +makedepends=('cmake' 'ros-build-tools' + ${ros_makedepends[@]} + tinyxml) -makedepends=( - 'cmake' - 'ros-build-tools' - ${ros_makedepends[@]} - tinyxml -) +ros_depends=(ros-melodic-tf + ros-melodic-std-msgs + ros-melodic-gazebo-msgs + ros-melodic-dynamic-reconfigure + ros-melodic-roscpp + ros-melodic-roslib + ros-melodic-std-srvs + ros-melodic-geometry-msgs + ros-melodic-rosgraph-msgs + ros-melodic-gazebo-dev) +depends=(${ros_depends[@]} + tinyxml + python) -ros_depends=( - ros-melodic-std-srvs - ros-melodic-tf - ros-melodic-geometry-msgs - ros-melodic-dynamic-reconfigure - ros-melodic-roslib - ros-melodic-rosgraph-msgs - ros-melodic-gazebo-dev - ros-melodic-roscpp - ros-melodic-gazebo-msgs - ros-melodic-std-msgs -) +# Git version (e.g. for debugging) +# _tag=release/melodic/gazebo_ros/${pkgver}-${_pkgver_patch} +# _dir=${pkgname} +# source=("${_dir}"::"git+https://github.com/ros-gbp/gazebo_ros_pkgs-release.git"#tag=${_tag}) +# sha256sums=('SKIP') -depends=( - ${ros_depends[@]} - tinyxml - python -) - -_dir=${pkgname} -source=("${_dir}"::"git+https://github.com/ros-gbp/gazebo_ros_pkgs-release.git") -sha256sums=('SKIP') - -prepare() { - cd ${srcdir}/${_dir} - git checkout upstream - _pkgname=$(echo ${pkgname} | sed 's/ros-lunar-//' | sed 's/-/_/g') - - if [ -d ${_pkgname} ]; then - git subtree split -P ${_pkgname} --branch ${_pkgname} - git checkout ${_pkgname} - fi -} +# Tarball version (faster download) +_dir="gazebo_ros_pkgs-release-release-melodic-gazebo_ros-${pkgver}-${_pkgver_patch}" +source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/gazebo_ros_pkgs-release/archive/release/melodic/gazebo_ros/${pkgver}-${_pkgver_patch}.tar.gz") +sha256sums=('fde5c96dfbdfcd8550ae4b731d199348b50955157f0bc114f754c5a55170ca8a') 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 the build directory. - [ -d ${srcdir}/build ] || mkdir ${srcdir}/build - cd ${srcdir}/build + # 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} + # Fix Python2/Python3 conflicts + /usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir} - # 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 + # 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 } package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}/" install + cd "${srcdir}/build" + make DESTDIR="${pkgdir}/" install } |