From e60a860283e5caf605331fdd1eb08aa85e2830d9 Mon Sep 17 00:00:00 2001 From: berrux_dev Date: Tue, 17 Nov 2026 17:12:26 +0100 Subject: [PATCH] Add the system KF6 plugin dir to ctest QT_PLUGIN_PATH GrantleeParserSmoke parses the codegen .grantlee templates with the KF6 TextTemplate engine, which loads the ktexttemplate_defaulttags plugin. The plugin ships in the system multiarch plugin dir (/usr/lib/x86_64-linux-gnu/qt6/plugins) via libkf6texttemplate-dev, which the aqt-installed /opt/Qt does not search by default, so every template failed with "Plugin library not found". Prepend the dir to QT_PLUGIN_PATH in the driver ctest step (same pattern as QT_QPA_PLATFORM=offscreen). Also includes the pending comment-only cleanup of this file (explanatory comment blocks removed; the only functional change is the QT_PLUGIN_PATH export line). --- .../new_docker_build_release2.sh | 26 +++++-------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/qt6-after/qt6-migrated-legatus/new_docker_build_release2.sh b/qt6-after/qt6-migrated-legatus/new_docker_build_release2.sh index 420d70154..efc8fdc1d 100755 --- a/qt6-after/qt6-migrated-legatus/new_docker_build_release2.sh +++ b/qt6-after/qt6-migrated-legatus/new_docker_build_release2.sh @@ -206,10 +206,6 @@ while [[ $# -gt 0 ]]; do --docker-image) DOCKER_IMAGE="$2" shift 2 - # Naming an image means using it: default to the prebuilt path, - # otherwise the flag is silently ignored and ubuntu:26.04 is built - # from scratch (missing dev packages like libbz2-dev). Force the - # base image by passing --no-prebuilt-image AFTER this flag. USE_PREBUILT_IMAGE="ON" ;; --cmake_build_flags) @@ -293,8 +289,6 @@ if [[ ! -d "${MIGRATE_PIPELINE_ROOT}" ]]; then fi # Validate rti_license.dat exists (required for DDS builds). -# The license may live in MIGRATE_PIPELINE_ROOT (CI convention) or, as in this -# checkout, be checked in at the source tree root. if [[ "${BUILD_GROUP1}" == "ON" ]]; then if [[ ! -f "${MIGRATE_PIPELINE_ROOT}/rti_license.dat" ]] && [[ ! -f "${SCRIPT_DIR}/rti_license.dat" ]]; then die "rti_license.dat not found in ${MIGRATE_PIPELINE_ROOT} or ${SCRIPT_DIR}. Required for DDS builds." @@ -578,9 +572,12 @@ build_group "GROUP6 (Tools/AP9)" "${BUILD_GROUP6}" "${GROUP6_TARGETS[@]}" if [[ "${RUN_CTEST}" == "ON" ]] && [[ "${TESTS_ONLY}" != "ON" ]]; then log_info "Running ctest..." cd "${BUILD_DIR}" - # GUI test executables need a Qt platform plugin; the container is - # headless, so use the offscreen plugin (xcb would abort without a display). export QT_QPA_PLATFORM="${QT_QPA_PLATFORM:-offscreen}" + # KF6 TextTemplate plugins (ktexttemplate_defaulttags, used by + # GrantleeParserSmoke) are installed by the system libkf6texttemplate-dev + # package under the multiarch plugin dir, which the /opt/Qt install does + # not search by default. Prepend it so Qt can load them. + export QT_PLUGIN_PATH="/usr/lib/x86_64-linux-gnu/qt6/plugins${QT_PLUGIN_PATH:+:${QT_PLUGIN_PATH}}" ctest --output-on-failure -j$(nproc) || log_info "Some tests failed (continuing)" cd .. fi @@ -598,12 +595,7 @@ if [[ "${RUN_JENKINS_BUILDER}" == "ON" ]]; then log_info "Staging workspace to ${STAGE_DIR}" rm -rf "${STAGE_DIR}" mkdir -p "${STAGE_DIR}" - # The driver build dir is ../build (next to the tree, outside it), so the - # tar of the tree above excludes it by construction; nothing in the DEB - # step consumes the driver build output (the DEB pipeline builds its own - # tree in /build). - # NOTE: no apostrophes allowed in comments here - this block lives inside - # the single-quoted docker bash -c string (see lines 477/653). + tar --exclude='./rpms' --exclude='./.git' --exclude='./build' \ --exclude='./deb_build_tmp' --exclude='./deb_stage' --exclude='./packages-out' \ --exclude='./legatus-qt6_1.0.tar.gz' \ @@ -622,11 +614,7 @@ if [[ "${RUN_JENKINS_BUILDER}" == "ON" ]]; then log_info " BUILD_NUMBER=${BUILD_NUMBER}" log_info " BUILD_TAG=${BUILD_TAG}" - # DEB cmake flags: -DBUILD_RTI=ON is required - the full-tree DEB build - # compiles RTI codegen consumers (e.g. svcPdmCommon -> pdm_enums.hpp) - # whose BUILD_RTI=OFF stubs were removed as "forbidden OFF variants". - # (A lone hash line inside a backslash-continued command breaks the - # continuation and drops the remaining arguments - keep comments outside it.) + # DEB cmake flags: -DBUILD_RTI=ON is required cd "${STAGED_SOURCE_DIR}/rpmbuild" if python3 make_rpm_ubuntu26_release2.py -c LTS \ --project_name "${PROJECT}" \