v1.0.2

4 files changed, 42 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6ca1f3559c28..511f9a225767 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = console-bridge
 	pkgdesc = A ROS-independent package for logging that seamlessly pipes into rosconsole/rosout for ROS-dependent packages.
-	pkgver = 1.0.1
-	pkgrel = 2
+	pkgver = 1.0.2
+	pkgrel = 1
 	url = http://www.ros.org/
 	arch = i686
 	arch = x86_64
@@ -11,9 +11,11 @@ pkgbase = console-bridge
 	arch = aarch64
 	license = BSD
 	makedepends = cmake
+	makedepends = cppcheck
 	depends = gcc-libs
-	source = https://github.com/ros/console_bridge/archive/1.0.1.tar.gz
-	sha256sums = 2ff175a9bb2b1849f12a6bf972ce7e4313d543a2bbc83b60fdae7db6e0ba353f
+	source = https://github.com/ros/console_bridge/archive/1.0.2.tar.gz
+	source = fix_repository_path.patch
+	sha256sums = 303a619c01a9e14a3c82eb9762b8a428ef5311a6d46353872ab9a904358be4a4
+	sha256sums = 2a5df5a0876791793805111b82e3ae159d3cdc04218f351f014b4d9461ceb26d
 
 pkgname = console-bridge
-
diff --git a/.gitignore b/.gitignore
index f34a96c51ab9..d5299e30856a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 pkg
 src
+*.pkg.*
diff --git a/PKGBUILD b/PKGBUILD
index f13708a7cfe4..19f124a9f31e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,25 +3,38 @@
 
 pkgname=console-bridge
 _pkgname=console_bridge
-pkgver=1.0.1
-pkgrel=2
+pkgver=1.0.2
+pkgrel=1
 pkgdesc="A ROS-independent package for logging that seamlessly pipes into rosconsole/rosout for ROS-dependent packages."
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7hv' 'aarch64')
 url="http://www.ros.org/"
 license=('BSD')
 depends=('gcc-libs')
-makedepends=('cmake')
-source=("https://github.com/ros/$_pkgname/archive/$pkgver.tar.gz")
-sha256sums=('2ff175a9bb2b1849f12a6bf972ce7e4313d543a2bbc83b60fdae7db6e0ba353f')
+makedepends=('cmake' 'cppcheck')
+source=("https://github.com/ros/$_pkgname/archive/$pkgver.tar.gz" "fix_repository_path.patch")
+sha256sums=('303a619c01a9e14a3c82eb9762b8a428ef5311a6d46353872ab9a904358be4a4'
+            '2a5df5a0876791793805111b82e3ae159d3cdc04218f351f014b4d9461ceb26d')
+
+prepare() {
+    patch -d "$_pkgname-$pkgver" -p0 -i "$srcdir/fix_repository_path.patch"
+}
 
 build() {
-    cd "$_pkgname-$pkgver"
-    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib .
-    make
+    cmake -B "build-$pkgver" -S "$_pkgname-$pkgver" \
+        -DBUILD_TESTING=ON \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_INSTALL_LIBDIR=lib
+    cmake --build "build-$pkgver"
+}
+
+check() {
+    AMENT_CPPCHECK_ALLOW_SLOW_VERSIONS=1 cmake --build "build-$pkgver" -t test
 }
 
 package() {
-    cd "$_pkgname-$pkgver"
-    make DESTDIR="$pkgdir/" install
-    install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    DESTDIR="$pkgdir/" cmake --install "build-$pkgver"
+
+    # install licence
+    install -Dm644 "$_pkgname-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/fix_repository_path.patch b/fix_repository_path.patch
new file mode 100644
index 000000000000..31fff63d8cb1
--- /dev/null
+++ b/fix_repository_path.patch
@@ -0,0 +1,10 @@
+--- test/CMakeLists.txt.orig	2022-03-10 07:43:47.000000000 +0100
++++ test/CMakeLists.txt	2022-06-10 23:15:17.690545530 +0200
+@@ -77,6 +77,7 @@
+                    "--counting=detailed"
+                    "--extensions=cpp,h"
+                    "--linelength=100"
++                   "--repository=${PROJECT_SOURCE_DIR}"
+                    "--filter=-build/c++11,-runtime/references,-whitespace/braces,-whitespace/indent,-whitespace/parens,-whitespace/semicolon"
+            "${PROJECT_SOURCE_DIR}/include/console_bridge/console.h"
+            "${PROJECT_SOURCE_DIR}/src/console.cpp"