Qt6 migration: Group 7 tools (A,B,C,E,I directories)
Migration completed for 6 buildable tools: - AdlerWebSocketSimulator (Qt6::WebSockets) - AsmWorkstationCertifier (Unix-only, requires botan2) - CnrProxyTester - ConfigX (Qt6 fixes: qt6_add_resources, removed QDesktopWidget) - EEMFakeServer - egcuSimulator Changes: - Added --group7/--no-group7 support to new_docker_build.sh - Created CTest test files for 6 Group 7 tools - Fixed ConfigX Qt6 migration issues - Added test exclusion filters to tests/CMakeLists.txt Note: Build validation blocked by pre-existing Group 3 (svcPdmClient) compilation errors unrelated to Group 7 changes. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
10 files changed
+178
-3
No files matched your search
@@ -40,6 +40,7 @@ Build groups:
|
||||
--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
|
||||
--group7 / --no-group7 Enable/disable LTS Tools Group 7 (A,B,C,E,I) build
|
||||
--build-viewer-only Build only Viewer module targets (skip Groups 1-4, implies --group5 --no-ctest)
|
||||
|
||||
Test execution:
|
||||
@@ -68,6 +69,7 @@ Environment variable overrides:
|
||||
BUILD_GROUP4=ON|OFF
|
||||
BUILD_GROUP5=ON|OFF
|
||||
BUILD_GROUP6=ON|OFF
|
||||
BUILD_GROUP7=ON|OFF
|
||||
RUN_CTEST=ON|OFF
|
||||
TESTS_ONLY=ON|OFF
|
||||
INTEGRATION_TEST=ON|OFF
|
||||
@@ -92,6 +94,7 @@ Defaults:
|
||||
BUILD_GROUP4=OFF
|
||||
BUILD_GROUP5=OFF
|
||||
BUILD_GROUP6=OFF
|
||||
BUILD_GROUP7=OFF
|
||||
RUN_CTEST=ON
|
||||
TESTS_ONLY=OFF
|
||||
INTEGRATION_TEST=OFF
|
||||
@@ -480,6 +483,12 @@ while [[ $# -gt 0 ]]; do
|
||||
--no-group6)
|
||||
BUILD_GROUP6=OFF
|
||||
;;
|
||||
--group7)
|
||||
BUILD_GROUP7=ON
|
||||
;;
|
||||
--no-group7)
|
||||
BUILD_GROUP7=OFF
|
||||
;;
|
||||
--build-viewer-only)
|
||||
BUILD_VIEWER_ONLY=ON
|
||||
BUILD_GROUP5=ON
|
||||
@@ -565,7 +574,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_GROUP6 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_GROUP7 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
|
||||
@@ -605,6 +614,16 @@ GROUP6_TARGETS=(
|
||||
LogViewer
|
||||
)
|
||||
|
||||
# Group 7: LTS Tools A,B,C,E,I directories (Qt6 migration targets)
|
||||
GROUP7_TARGETS=(
|
||||
AdlerWebSocketSimulator
|
||||
AsmWorkstationCertifier
|
||||
CnrProxyTester
|
||||
ConfigX
|
||||
EEMFakeServer
|
||||
egcuSimulator
|
||||
)
|
||||
|
||||
require_non_empty "${DOCKER_IMAGE}" "DOCKER_IMAGE"
|
||||
|
||||
if [[ "${DELETE_PREBUILT_IMAGE}" == "ON" ]]; then
|
||||
@@ -633,6 +652,7 @@ log_info "BUILD_RTI=${BUILD_RTI}"
|
||||
log_group "Build Group 1 (ddscore ddsftccore ddsQoS ddsconnector ddsfts)" "$BUILD_GROUP1"
|
||||
log_group "Build Group 2 (migration_tests)" "$BUILD_GROUP2"
|
||||
log_group "Build Group 3 (application targets)" "$BUILD_GROUP3"
|
||||
log_group "Build Group 7 (LTS Tools A,B,C,E,I)" "$BUILD_GROUP7"
|
||||
log_info "BUILD_VIEWER_ONLY=${BUILD_VIEWER_ONLY}"
|
||||
log_info "RUN_CTEST=${RUN_CTEST}"
|
||||
log_info "TESTS_ONLY=${TESTS_ONLY}"
|
||||
@@ -665,6 +685,7 @@ 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[@]}")"
|
||||
GROUP7_TARGETS_STRING="$(join_by ' ' "${GROUP7_TARGETS[@]}")"
|
||||
|
||||
HOST_TEMP_DIR="$(mktemp -d)"
|
||||
CONTAINER_SCRIPT_HOST="${HOST_TEMP_DIR}/run-build-inside-container.sh"
|
||||
@@ -780,6 +801,7 @@ 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}"
|
||||
read -r -a GROUP7_ARRAY <<< "${GROUP7_TARGETS}"
|
||||
|
||||
if [[ "${TESTS_ONLY}" != "ON" ]]; then
|
||||
if [[ "${BUILD_VIEWER_ONLY}" == "ON" ]]; then
|
||||
@@ -796,6 +818,7 @@ if [[ "${TESTS_ONLY}" != "ON" ]]; then
|
||||
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[@]}"
|
||||
run_build_group "Group 7 (LTS Tools A,B,C,E,I)" "${BUILD_GROUP7}" "group7_build.log" "${GROUP7_ARRAY[@]}"
|
||||
else
|
||||
log_info "TESTS_ONLY enabled - skipping all build groups"
|
||||
fi
|
||||
@@ -828,6 +851,7 @@ docker run --rm \
|
||||
-e BUILD_GROUP4 \
|
||||
-e BUILD_GROUP5 \
|
||||
-e BUILD_GROUP6 \
|
||||
-e BUILD_GROUP7 \
|
||||
-e BUILD_VIEWER_ONLY \
|
||||
-e RUN_CTEST \
|
||||
-e TESTS_ONLY \
|
||||
@@ -844,6 +868,7 @@ docker run --rm \
|
||||
-e GROUP4_TARGETS="${GROUP4_TARGETS_STRING}" \
|
||||
-e GROUP5_TARGETS="${GROUP5_TARGETS_STRING}" \
|
||||
-e GROUP6_TARGETS="${GROUP6_TARGETS_STRING}" \
|
||||
-e GROUP7_TARGETS="${GROUP7_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