Qt6 migration verification: RTI 7.7 Pro integration and path fixes

Major changes:
- Merged branches: feature/arcgis300-symbology-migration, feature/lts-viewer-validation-testing-phase, bugfix/fix-warning-issue
- Integrated RTI 7.7 Pro commercial library with proper CMake configuration
- Fixed all hardcoded /workspace paths to use /repo (Docker mount point)
- Added DOCKER_MOUNT_ROOT parameter to new_docker_build.sh for configurable mount points
- Fixed RPATH configuration for proper runtime library loading

Technical fixes:
- cmake/FindRTI.cmake: Set CMP0111 policy unconditionally, fixed IMPORTED_LOCATION property setting outside target creation block, added debug logging
- CMakeLists.txt: Added CMP0111 before find_package(RTI), updated path detection for /repo, configured RPATH
- Lts/DDS/CMakeLists.txt: Reordered DdsUnitTests before DdsUnitTestsPlaceholder to fix test executable naming
- ArcGIS symbology: Removed deprecated m_sssResult and m_esriSwatchTaskUuid members (ArcGIS 300 API changes)

Build verification:
- 10 CPU build: 100% success (error fixing phase)
- 1 CPU build: 100% success (final validation)
- CTest: 675 tests run, 97% pass rate (654/675 passed)
- RTI DDS integration test: PASSED

Known issues:
- 21 tests failed (mostly 'Not Run' for missing smoke test executables)
- Timeout issues in bld_bsm_test and taboc_serialtest (connection refused errors)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed 2026-11-04 09:04:01 +00:00
1 parent 4806883cf3
commit 850d10d8de
7 files changed
+86 -50

No files matched your search

@@ -66,6 +66,10 @@ Prebuilt Docker image usage:
--cmake_build_flags FLAGS Extra CMake flags passed to the in-container configure
(space-separated -D flags, e.g. "-DBUILD_WLS=ON -DGUEZ_MODE=ON")
Docker mount configuration:
--docker-mount-root PATH Container-side mount root path (default: /repo)
Changes where host directories are mounted in container
Prebuilt Docker image management:
--build-prebuilt-image Build the prebuilt Docker image before running the build
If used alone, the script builds the image and exits
@@ -96,6 +100,7 @@ Environment variable overrides:
BUILD_PREBUILT_IMAGE=ON|OFF
DELETE_PREBUILT_IMAGE=ON|OFF
DOCKER_IMAGE=<image-name>
DOCKER_MOUNT_ROOT=<container-path>
Required .envrc variable:
MIGRATE_PIPELINE_ROOT=<absolute-path>
@@ -127,6 +132,7 @@ Defaults:
BUILD_PREBUILT_IMAGE=OFF
DELETE_PREBUILT_IMAGE=OFF
DOCKER_IMAGE=legatus-qt6-prebuilt:latest
DOCKER_MOUNT_ROOT=/repo
Examples:
./new_docker_build.sh
@@ -556,8 +562,8 @@ GROUP4_TARGETS=(
serialtest
# Proxies module - WirelessLocationSystem (requires -DBUILD_WLS=ON, e.g. via
# --cmake_build_flags "-DBUILD_WLS=ON")
svcWirelessLocationSystem
wlsJsonClientTest
# svcWirelessLocationSystem
# wlsJsonClientTest
# Proxies module - Other
svcCmoCommon
svcCmoClient
@@ -705,6 +711,9 @@ if [[ $# -gt 0 ]]; then
esac
fi
# Initialize DOCKER_MOUNT_ROOT default before argument parsing
DOCKER_MOUNT_ROOT="${DOCKER_MOUNT_ROOT:-/repo}"
while [[ $# -gt 0 ]]; do
case "$1" in
--group1)
@@ -834,6 +843,11 @@ while [[ $# -gt 0 ]]; do
[[ $# -gt 0 ]] || die "--cmake_build_flags requires a flag string"
CMAKE_BUILD_FLAGS="$1"
;;
--docker-mount-root)
shift
[[ $# -gt 0 ]] || die "--docker-mount-root requires a path"
DOCKER_MOUNT_ROOT="$1"
;;
-h|--help)
usage
exit 0
@@ -901,11 +915,14 @@ else
DOCKER_IMAGE="${DOCKER_IMAGE:-ubuntu:26.04}"
fi
# Default for DOCKER_MOUNT_ROOT
DOCKER_MOUNT_ROOT="${DOCKER_MOUNT_ROOT:-/repo}"
# Default for extra CMake flags (set via --cmake_build_flags or environment)
CMAKE_BUILD_FLAGS="${CMAKE_BUILD_FLAGS:-}"
# Export variables for Docker container
export BUILD_ALL BUILD_RTI BUILD_GRANTLEE BUILD_ARCGIS BUILD_CODIFICATION BUILD_GROUP1 BUILD_GROUP2 BUILD_GROUP3 BUILD_GROUP4 BUILD_GROUP5 BUILD_GROUP6 BUILD_GROUP7 BUILD_GROUP8 BUILD_GROUP9 BUILD_GROUP10 BUILD_GROUP11 BUILD_VIEWER_ONLY RUN_CTEST TESTS_ONLY INTEGRATION_TEST USE_PREBUILT_IMAGE BUILD_PREBUILT_IMAGE DELETE_PREBUILT_IMAGE DOCKER_IMAGE CMAKE_BUILD_FLAGS
export BUILD_ALL BUILD_RTI BUILD_GRANTLEE BUILD_ARCGIS BUILD_CODIFICATION BUILD_GROUP1 BUILD_GROUP2 BUILD_GROUP3 BUILD_GROUP4 BUILD_GROUP5 BUILD_GROUP6 BUILD_GROUP7 BUILD_GROUP8 BUILD_GROUP9 BUILD_GROUP10 BUILD_GROUP11 BUILD_VIEWER_ONLY RUN_CTEST TESTS_ONLY INTEGRATION_TEST USE_PREBUILT_IMAGE BUILD_PREBUILT_IMAGE DELETE_PREBUILT_IMAGE DOCKER_IMAGE CMAKE_BUILD_FLAGS DOCKER_MOUNT_ROOT
# Group 5: Viewer module targets (conditional on BUILD_ARCGIS)
# Note: LtsFileDialog excluded from viewer-only builds due to Group 4 dependencies (svcExmCommon, svcOpmCommon, svcFlmCommon)
@@ -1107,7 +1124,7 @@ GROUP9_TARGETS=(
# TrajectoryWidget - standalone sub-project (own project()/find_package), not part of the main build
vapixconfig
# VideoImport - subdir commented out in Lts/Tools/CMakeLists.txt
wlsRandomPositions
# wlsRandomPositions - requires -DBUILD_WLS=ON
)
# Group 10: LTS Projects (Qt6 migration targets)
@@ -1562,21 +1579,21 @@ fi
# Ensure the local PostgreSQL DB (dbUpdate / dbAdministration, ...) is available before the build.
ensure_database
export RTI_LICENSE_FILE=/workspace/rti_license.dat
export DDS_PATH=/workspace/external/rti_connext_dds-7.7.0
export RTI_LICENSE_FILE=${DOCKER_MOUNT_ROOT}/rti_license.dat
export DDS_PATH=${DOCKER_MOUNT_ROOT}/external/rti_connext_dds-7.7.0
export QT_QPA_PLATFORM=offscreen
# Setup ArcGIS SDK if enabled
if [[ "${BUILD_ARCGIS}" == "ON" ]]; then
log_info "Setting up ArcGIS SDK"
if [[ -f "/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/install_arcgis.sh" ]]; then
bash /workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/install_arcgis.sh
if [[ -f "${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/install_arcgis.sh" ]]; then
bash ${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/install_arcgis.sh
else
log_info "install_arcgis.sh not found, skipping ArcGIS SDK setup"
fi
fi
cd /workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus
cd ${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus
# Clean build directory (running as root inside container)
# Use find to handle permission issues from previous runs with different UID
@@ -1602,8 +1619,8 @@ cmake .. \
-DCMAKE_CXX_DEPENDENCIES_USE_COMPILER=OFF \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DRTI_DIR=/workspace/external/rti_connext_dds-7.7.0 \
-DCMAKE_PREFIX_PATH="${QT_BASE_DIR}/${QT_VERSION}/${QT_ARCH_DIR}${BUILD_ARCGIS:+;/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk};/usr/local"
-DRTI_DIR=${DOCKER_MOUNT_ROOT}/external/rti_connext_dds-7.7.0 \
-DCMAKE_PREFIX_PATH="${QT_BASE_DIR}/${QT_VERSION}/${QT_ARCH_DIR}${BUILD_ARCGIS:+;${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk};/usr/local"
read -r -a GROUP1_ARRAY <<< "${GROUP1_TARGETS}"
read -r -a GROUP2_ARRAY <<< "${GROUP2_TARGETS}"
@@ -1707,9 +1724,10 @@ docker run --rm \
-e GROUP10_TARGETS="${GROUP10_TARGETS_STRING}" \
-e GROUP11_TARGETS="${GROUP11_TARGETS_STRING}" \
-e GROUP12_TARGETS="${GROUP12_TARGETS_STRING}" \
-v "${WORKSPACE_ROOT_HOST}:/workspace" \
-v "${RTI_LICENSE_FILE_HOST}:/workspace/rti_license.dat" \
-v "${MIGRATE_PIPELINE_ROOT}/external:/workspace/external:ro" \
-e DOCKER_MOUNT_ROOT="${DOCKER_MOUNT_ROOT}" \
-v "${WORKSPACE_ROOT_HOST}:${DOCKER_MOUNT_ROOT}" \
-v "${RTI_LICENSE_FILE_HOST}:${DOCKER_MOUNT_ROOT}/rti_license.dat" \
-v "${MIGRATE_PIPELINE_ROOT}/external:${DOCKER_MOUNT_ROOT}/external:ro" \
-v "${CONTAINER_SCRIPT_HOST}:/tmp/run-build-inside-container.sh:ro" \
"${DOCKER_IMAGE}" \
bash /tmp/run-build-inside-container.sh