ci: upgrade gcovr to the latest version

And adjust lcov invocation for lcov 2.1

Change-Id: I0cb932183a386ad004239876412bfa0f694ecece

Author: Pesa

.jenkins.d/00-deps.sh

@@ -31,7 +31,7 @@ DNF_PKGS=(
 FORMULAE=(boost openssl pkgconf)
 case $JOB_NAME in
     *code-coverage)
-        APT_PKGS+=(lcov)
+        APT_PKGS+=(lcov libjson-xs-perl)
         ;;
     *Docs)
         APT_PKGS+=(doxygen graphviz)

.jenkins.d/30-coverage.sh

@@ -8,29 +8,37 @@ export UV_NO_MANAGED_PYTHON=1
 
 set -x
 
-# Generate an XML report (Cobertura format) and a detailed HTML report using gcovr
+# Generate a detailed HTML report and an XML report in Cobertura format using gcovr
 # Note: trailing slashes are important in the paths below. Do not remove them!
-uvx gcovr@5.2 \
-    --object-directory build \
+uvx --from 'git+https://github.com/gcovr/gcovr@99b82e7' gcovr \
+    --decisions \
     --filter PSync/ \
     --exclude-throw-branches \
     --exclude-unreachable-branches \
     --cobertura build/coverage.xml \
     --html-details build/gcovr/ \
-    --print-summary
+    --txt-summary \
+    build
 
 # Generate a detailed HTML report using lcov
-lcov --quiet \
-     --capture \
-     --directory . \
-     --exclude "$PWD/tests/*" \
-     --no-external \
-     --rc lcov_branch_coverage=1 \
-     --output-file build/coverage.info
+lcov \
+    --quiet \
+    --capture \
+    --directory . \
+    --include "$PWD/PSync/*" \
+    --ignore-errors count,inconsistent \
+    --branch-coverage \
+    --rc no_exception_branch=1 \
+    --output-file build/coverage.info
 
-genhtml --branch-coverage \
-        --demangle-cpp \
-        --legend \
-        --output-directory build/lcov \
-        --title "PSync unit tests" \
-        build/coverage.info
+genhtml \
+    --quiet \
+    --branch-coverage \
+    --demangle-cpp \
+    --flat \
+    --legend \
+    --missed \
+    --show-proportion \
+    --title "PSync $(cat VERSION.info)" \
+    --output-directory build/lcov \
+    build/coverage.info

wscript

@@ -86,10 +86,12 @@ def configure(conf):
     conf.write_config_header('PSync/detail/config.hpp', define_prefix='PSYNC_')
 
 def build(bld):
+    version(bld)
+
     bld.shlib(
         target='PSync',
-        vnum=VERSION,
-        cnum=VERSION,
+        vnum=VERSION_BASE,
+        cnum=VERSION_BASE,
         source=bld.path.ant_glob('PSync/**/*.cpp'),
         use='BOOST NDN_CXX',
         includes='.',
@@ -110,7 +112,7 @@ def build(bld):
         source='PSync.pc.in',
         target='PSync.pc',
         install_path='${LIBDIR}/pkgconfig',
-        VERSION=VERSION)
+        VERSION=VERSION_BASE)
 
 def docs(bld):
     from waflib import Options