Migrate LTS Tools Group 6 (D&L) to Qt6
Build script changes: - Add --group6/--no-group6 argument support to new_docker_build.sh - Add GROUP6_TARGETS array with 11 LTS tools - Add BUILD_GROUP6 environment variable export - Add GROUP6 build invocation in run_build_group function Test infrastructure: - Create CTest test files for all 11 Group 6 tools - Add exclusion filters in tests/CMakeLists.txt for conditional builds - Tests follow gtest pattern: CompilationStub, Qt6ApiCompatibility, BasicFunctionality Qt6 migration bug fixes: - DBAdministration: Fix m_id → id member access (3 files) - DBAdministration: Add missing QFile include in showLogFile.cpp - DBUpdate: Add CMAKE_AUTOUIC_SEARCH_PATHS for ui/ directory - DBUpdate: Fix m_id → id, m_description → description (3 files) Build validation: - DBAdministration, DBOperatorSettingsRemover, DBUpdate build successfully - Remaining tools blocked by pre-existing Group 3 (ExerciseManagement) errors - Policy checks passed Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
21 files changed
+548
-18
No files matched your search
@@ -39,6 +39,7 @@ Build groups:
|
||||
--group3 / --no-group3 Enable/disable remaining application targets build
|
||||
--group4 / --no-group4 Enable/disable Lts/Proxies module targets and tests only
|
||||
--group5 / --no-group5 Enable/disable Lts/Viewer module targets and tests only
|
||||
--group6 / --no-group6 Enable/disable LTS Tools (Qt6 migration) build
|
||||
--build-viewer-only Build only Viewer module targets (skip Groups 1-4, implies --group5 --no-ctest)
|
||||
|
||||
Test execution:
|
||||
@@ -66,6 +67,7 @@ Environment variable overrides:
|
||||
BUILD_GROUP3=ON|OFF
|
||||
BUILD_GROUP4=ON|OFF
|
||||
BUILD_GROUP5=ON|OFF
|
||||
BUILD_GROUP6=ON|OFF
|
||||
RUN_CTEST=ON|OFF
|
||||
TESTS_ONLY=ON|OFF
|
||||
INTEGRATION_TEST=ON|OFF
|
||||
@@ -89,6 +91,7 @@ Defaults:
|
||||
BUILD_GROUP3=ON
|
||||
BUILD_GROUP4=OFF
|
||||
BUILD_GROUP5=OFF
|
||||
BUILD_GROUP6=OFF
|
||||
RUN_CTEST=ON
|
||||
TESTS_ONLY=OFF
|
||||
INTEGRATION_TEST=OFF
|
||||
@@ -411,6 +414,7 @@ BUILD_GROUP2="${BUILD_GROUP2:-ON}"
|
||||
BUILD_GROUP3="${BUILD_GROUP3:-ON}"
|
||||
BUILD_GROUP4="${BUILD_GROUP4:-OFF}"
|
||||
BUILD_GROUP5="${BUILD_GROUP5:-OFF}"
|
||||
BUILD_GROUP6="${BUILD_GROUP6:-OFF}"
|
||||
BUILD_VIEWER_ONLY="${BUILD_VIEWER_ONLY:-OFF}"
|
||||
RUN_CTEST="${RUN_CTEST:-ON}"
|
||||
TESTS_ONLY="${TESTS_ONLY:-OFF}"
|
||||
@@ -470,6 +474,12 @@ while [[ $# -gt 0 ]]; do
|
||||
--no-group5)
|
||||
BUILD_GROUP5=OFF
|
||||
;;
|
||||
--group6)
|
||||
BUILD_GROUP6=ON
|
||||
;;
|
||||
--no-group6)
|
||||
BUILD_GROUP6=OFF
|
||||
;;
|
||||
--build-viewer-only)
|
||||
BUILD_VIEWER_ONLY=ON
|
||||
BUILD_GROUP5=ON
|
||||
@@ -555,7 +565,7 @@ BUILD_PREBUILT_IMAGE="$(normalize_on_off "$BUILD_PREBUILT_IMAGE" "BUILD_PREBUILT
|
||||
DELETE_PREBUILT_IMAGE="$(normalize_on_off "$DELETE_PREBUILT_IMAGE" "DELETE_PREBUILT_IMAGE")"
|
||||
|
||||
# Export variables for Docker container
|
||||
export BUILD_ALL BUILD_RTI BUILD_GRANTLEE BUILD_ARCGIS BUILD_GROUP1 BUILD_GROUP2 BUILD_GROUP3 BUILD_GROUP4 BUILD_GROUP5 BUILD_VIEWER_ONLY RUN_CTEST TESTS_ONLY INTEGRATION_TEST USE_PREBUILT_IMAGE BUILD_PREBUILT_IMAGE DELETE_PREBUILT_IMAGE DOCKER_IMAGE
|
||||
export BUILD_ALL BUILD_RTI BUILD_GRANTLEE BUILD_ARCGIS BUILD_GROUP1 BUILD_GROUP2 BUILD_GROUP3 BUILD_GROUP4 BUILD_GROUP5 BUILD_GROUP6 BUILD_VIEWER_ONLY RUN_CTEST TESTS_ONLY INTEGRATION_TEST USE_PREBUILT_IMAGE BUILD_PREBUILT_IMAGE DELETE_PREBUILT_IMAGE DOCKER_IMAGE
|
||||
|
||||
# Group 5: Viewer module targets (conditional on BUILD_ARCGIS)
|
||||
if [[ "${BUILD_ARCGIS}" == "ON" ]]; then
|
||||
@@ -579,6 +589,22 @@ else
|
||||
)
|
||||
fi
|
||||
|
||||
# Group 6: LTS Tools (Qt6 migration targets)
|
||||
# These tools require RTI DDS for DataSampleGenerator, DataSampleReceiver, and DdsView
|
||||
GROUP6_TARGETS=(
|
||||
dbAdministration
|
||||
SettingsRemover
|
||||
dbUpdate
|
||||
tDataSampleGenerator
|
||||
tDataSampleReceiver
|
||||
DateTimeSyncer
|
||||
ddsview
|
||||
displayPanelSimulator
|
||||
LicenceEditor
|
||||
localDomainFinder
|
||||
LogViewer
|
||||
)
|
||||
|
||||
require_non_empty "${DOCKER_IMAGE}" "DOCKER_IMAGE"
|
||||
|
||||
if [[ "${DELETE_PREBUILT_IMAGE}" == "ON" ]]; then
|
||||
@@ -638,6 +664,7 @@ GROUP2_TARGETS_STRING="$(join_by ' ' "${GROUP2_TARGETS[@]}")"
|
||||
GROUP3_TARGETS_STRING="$(join_by ' ' "${GROUP3_TARGETS[@]}")"
|
||||
GROUP4_TARGETS_STRING="$(join_by ' ' "${GROUP4_TARGETS[@]}")"
|
||||
GROUP5_TARGETS_STRING="$(join_by ' ' "${GROUP5_TARGETS[@]}")"
|
||||
GROUP6_TARGETS_STRING="$(join_by ' ' "${GROUP6_TARGETS[@]}")"
|
||||
|
||||
HOST_TEMP_DIR="$(mktemp -d)"
|
||||
CONTAINER_SCRIPT_HOST="${HOST_TEMP_DIR}/run-build-inside-container.sh"
|
||||
@@ -752,6 +779,7 @@ read -r -a GROUP2_ARRAY <<< "${GROUP2_TARGETS}"
|
||||
read -r -a GROUP3_ARRAY <<< "${GROUP3_TARGETS}"
|
||||
read -r -a GROUP4_ARRAY <<< "${GROUP4_TARGETS}"
|
||||
read -r -a GROUP5_ARRAY <<< "${GROUP5_TARGETS}"
|
||||
read -r -a GROUP6_ARRAY <<< "${GROUP6_TARGETS}"
|
||||
|
||||
if [[ "${TESTS_ONLY}" != "ON" ]]; then
|
||||
if [[ "${BUILD_VIEWER_ONLY}" == "ON" ]]; then
|
||||
@@ -767,6 +795,7 @@ if [[ "${TESTS_ONLY}" != "ON" ]]; then
|
||||
run_build_group "Group 3" "${BUILD_GROUP3}" "group3_build.log" "${GROUP3_ARRAY[@]}"
|
||||
run_build_group "Group 4" "${BUILD_GROUP4}" "group4_build.log" "${GROUP4_ARRAY[@]}"
|
||||
run_build_group "Group 5 (Viewer)" "${BUILD_GROUP5}" "group5_build.log" "${GROUP5_ARRAY[@]}"
|
||||
run_build_group "Group 6 (LTS Tools)" "${BUILD_GROUP6}" "group6_build.log" "${GROUP6_ARRAY[@]}"
|
||||
else
|
||||
log_info "TESTS_ONLY enabled - skipping all build groups"
|
||||
fi
|
||||
@@ -798,6 +827,7 @@ docker run --rm \
|
||||
-e BUILD_GROUP3 \
|
||||
-e BUILD_GROUP4 \
|
||||
-e BUILD_GROUP5 \
|
||||
-e BUILD_GROUP6 \
|
||||
-e BUILD_VIEWER_ONLY \
|
||||
-e RUN_CTEST \
|
||||
-e TESTS_ONLY \
|
||||
@@ -813,6 +843,7 @@ docker run --rm \
|
||||
-e GROUP3_TARGETS="${GROUP3_TARGETS_STRING}" \
|
||||
-e GROUP4_TARGETS="${GROUP4_TARGETS_STRING}" \
|
||||
-e GROUP5_TARGETS="${GROUP5_TARGETS_STRING}" \
|
||||
-e GROUP6_TARGETS="${GROUP6_TARGETS_STRING}" \
|
||||
-v "${WORKSPACE_ROOT_HOST}:/workspace" \
|
||||
-v "${RTI_LICENSE_FILE_HOST}:/workspace/rti_license.dat" \
|
||||
-v "${MIGRATE_PIPELINE_ROOT}/external:/workspace/external:ro" \
|
||||
|
||||
Reference in new issue
Block a user