summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGonçalo Camelo Neves Pereira2018-09-08 14:57:46 +0200
committerGonçalo Camelo Neves Pereira2018-09-08 14:57:46 +0200
commit953f94864332f8eca268bb881f8d3b87430a2ffe (patch)
tree581a6f8ea8921aea097c8c85cf9c229f521f3fd9
parent67acf9dfb1dc44e5b6da847c1304e5e61ad046bb (diff)
downloadaur-953f94864332f8eca268bb881f8d3b87430a2ffe.tar.gz
Update!
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD99
2 files changed, 61 insertions, 46 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 99ca45531fb..0531f2b151c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,15 +7,15 @@ pkgbase = ros-melodic-roscpp-serialization
license = BSD
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-melodic-roscpp-traits
makedepends = ros-melodic-cpp-common
+ makedepends = ros-melodic-roscpp-traits
makedepends = ros-melodic-catkin
makedepends = ros-melodic-rostime
- depends = ros-melodic-roscpp-traits
depends = ros-melodic-cpp-common
+ depends = ros-melodic-roscpp-traits
depends = ros-melodic-rostime
- source = ros-melodic-roscpp-serialization-0.6.11-0.tar.gz::https://github.com/ros-gbp/roscpp_core-release/archive/release/melodic/roscpp_serialization/0.6.11-0.tar.gz
- sha256sums = 9df0441f142422b87b6fa226c98d08456c26f18f32590d26bbbd417950ada3b5
+ source = ros-melodic-roscpp-serialization::git+https://github.com/ros-gbp/roscpp_core-release.git
+ sha256sums = SKIP
pkgname = ros-melodic-roscpp-serialization
diff --git a/PKGBUILD b/PKGBUILD
index 536d836fd08..59f2292895d 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 - roscpp_serialization contains the code for serialization as described in MessagesSerializationAndAdaptingTypes."
url='http://ros.org/wiki/roscpp_serialization'
@@ -10,55 +10,70 @@ arch=('any')
pkgrel=1
license=('BSD')
-ros_makedepends=(ros-melodic-roscpp-traits
- ros-melodic-cpp-common
- ros-melodic-catkin
- ros-melodic-rostime)
-makedepends=('cmake' 'ros-build-tools'
- ${ros_makedepends[@]})
+ros_makedepends=(
+ ros-melodic-cpp-common
+ ros-melodic-roscpp-traits
+ ros-melodic-catkin
+ ros-melodic-rostime
+)
-ros_depends=(ros-melodic-roscpp-traits
- ros-melodic-cpp-common
- ros-melodic-rostime)
-depends=(${ros_depends[@]})
+makedepends=(
+ 'cmake'
+ 'ros-build-tools'
+ ${ros_makedepends[@]}
+)
-# Git version (e.g. for debugging)
-# _tag=release/melodic/roscpp_serialization/${pkgver}-${_pkgver_patch}
-# _dir=${pkgname}
-# source=("${_dir}"::"git+https://github.com/ros-gbp/roscpp_core-release.git"#tag=${_tag})
-# sha256sums=('SKIP')
+ros_depends=(
+ ros-melodic-cpp-common
+ ros-melodic-roscpp-traits
+ ros-melodic-rostime
+)
-# Tarball version (faster download)
-_dir="roscpp_core-release-release-melodic-roscpp_serialization-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/roscpp_core-release/archive/release/melodic/roscpp_serialization/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('9df0441f142422b87b6fa226c98d08456c26f18f32590d26bbbd417950ada3b5')
+depends=(
+ ${ros_depends[@]}
+)
+
+_dir=${pkgname}
+source=("${_dir}"::"git+https://github.com/ros-gbp/roscpp_core-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
+}
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 2 ${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/python2 \
- -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
- -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
- -DPYTHON_BASENAME=-python2.7 \
- -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
}