diff --git a/qt6-after/qt6-migrated-legatus/new_docker_build.sh b/qt6-after/qt6-migrated-legatus/new_docker_build.sh index f75b5db8a..dc3661bc0 100755 --- a/qt6-after/qt6-migrated-legatus/new_docker_build.sh +++ b/qt6-after/qt6-migrated-legatus/new_docker_build.sh @@ -41,6 +41,10 @@ Build groups: --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 + --group8 / --no-group8 Enable/disable LTS Tools Group 8 (J,M,N,P,Q) build + --group9 / --no-group9 Enable/disable LTS Tools Group 9 (R,S,T,V,W) build + --group10 / --no-group10 Enable/disable LTS Projects build + --group11 / --no-group11 Enable/disable LTS Application build --build-viewer-only Build only Viewer module targets (skip Groups 1-4, implies --group5 --no-ctest) Test execution: @@ -71,6 +75,9 @@ Environment variable overrides: BUILD_GROUP6=ON|OFF BUILD_GROUP7=ON|OFF BUILD_GROUP8=ON|OFF + BUILD_GROUP9=ON|OFF + BUILD_GROUP10=ON|OFF + BUILD_GROUP11=ON|OFF RUN_CTEST=ON|OFF TESTS_ONLY=ON|OFF INTEGRATION_TEST=ON|OFF @@ -98,6 +105,8 @@ Defaults: BUILD_GROUP7=OFF BUILD_GROUP8=OFF BUILD_GROUP9=OFF + BUILD_GROUP10=OFF + BUILD_GROUP11=OFF RUN_CTEST=ON TESTS_ONLY=OFF INTEGRATION_TEST=OFF @@ -504,6 +513,18 @@ while [[ $# -gt 0 ]]; do --no-group9) BUILD_GROUP9=OFF ;; + --group10) + BUILD_GROUP10=ON + ;; + --no-group10) + BUILD_GROUP10=OFF + ;; + --group11) + BUILD_GROUP11=ON + ;; + --no-group11) + BUILD_GROUP11=OFF + ;; --build-viewer-only) BUILD_VIEWER_ONLY=ON BUILD_GROUP5=ON @@ -589,7 +610,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_GROUP7 BUILD_GROUP8 BUILD_GROUP9 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_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 # Group 5: Viewer module targets (conditional on BUILD_ARCGIS) if [[ "${BUILD_ARCGIS}" == "ON" ]]; then @@ -663,6 +684,26 @@ GROUP9_TARGETS=( WlsRandomPositions ) +# Group 10: LTS Projects (Qt6 migration targets) +GROUP10_TARGETS=( + ProjectGuezPlugin + ProjectQatarMOUTPlugin + ProjectQatarPlugin + ProjectLegatusPlugin + ProjectDemoTabletPlugin + ProjectL400P2Plugin + ProjectComMasterPlugin + ProjectAhtcPlugin + ProjectEtsPlugin +) + +# Group 11: LTS Application (Qt6 migration targets) +GROUP11_TARGETS=( + OperatorApplication + thp_viewer + aarApp +) + require_non_empty "${DOCKER_IMAGE}" "DOCKER_IMAGE" if [[ "${DELETE_PREBUILT_IMAGE}" == "ON" ]]; then @@ -694,6 +735,8 @@ log_group "Build Group 3 (application targets)" "$BUILD_GROUP3" log_group "Build Group 7 (LTS Tools A,B,C,E,I)" "$BUILD_GROUP7" log_group "Build Group 8 (LTS Tools J,M,N,P,Q)" "$BUILD_GROUP8" log_group "Build Group 9 (LTS Tools R,S,T,V,W)" "$BUILD_GROUP9" +log_group "Build Group 10 (LTS Projects)" "$BUILD_GROUP10" +log_group "Build Group 11 (LTS Application)" "$BUILD_GROUP11" log_info "BUILD_VIEWER_ONLY=${BUILD_VIEWER_ONLY}" log_info "RUN_CTEST=${RUN_CTEST}" log_info "TESTS_ONLY=${TESTS_ONLY}" @@ -729,6 +772,8 @@ GROUP6_TARGETS_STRING="$(join_by ' ' "${GROUP6_TARGETS[@]}")" GROUP7_TARGETS_STRING="$(join_by ' ' "${GROUP7_TARGETS[@]}")" GROUP8_TARGETS_STRING="$(join_by ' ' "${GROUP8_TARGETS[@]}")" GROUP9_TARGETS_STRING="$(join_by ' ' "${GROUP9_TARGETS[@]}")" +GROUP10_TARGETS_STRING="$(join_by ' ' "${GROUP10_TARGETS[@]}")" +GROUP11_TARGETS_STRING="$(join_by ' ' "${GROUP11_TARGETS[@]}")" HOST_TEMP_DIR="$(mktemp -d)" CONTAINER_SCRIPT_HOST="${HOST_TEMP_DIR}/run-build-inside-container.sh" @@ -752,6 +797,12 @@ 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_GROUP7="${BUILD_GROUP7:-OFF}" +BUILD_GROUP8="${BUILD_GROUP8:-OFF}" +BUILD_GROUP9="${BUILD_GROUP9:-OFF}" +BUILD_GROUP10="${BUILD_GROUP10:-OFF}" +BUILD_GROUP11="${BUILD_GROUP11:-OFF}" BUILD_VIEWER_ONLY="${BUILD_VIEWER_ONLY:-OFF}" RUN_CTEST="${RUN_CTEST:-ON}" TESTS_ONLY="${TESTS_ONLY:-OFF}" @@ -845,6 +896,10 @@ 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}" +read -r -a GROUP8_ARRAY <<< "${GROUP8_TARGETS}" +read -r -a GROUP9_ARRAY <<< "${GROUP9_TARGETS}" +read -r -a GROUP10_ARRAY <<< "${GROUP10_TARGETS}" +read -r -a GROUP11_ARRAY <<< "${GROUP11_TARGETS}" if [[ "${TESTS_ONLY}" != "ON" ]]; then if [[ "${BUILD_VIEWER_ONLY}" == "ON" ]]; then @@ -864,6 +919,8 @@ if [[ "${TESTS_ONLY}" != "ON" ]]; then run_build_group "Group 7 (LTS Tools A,B,C,E,I)" "${BUILD_GROUP7}" "group7_build.log" "${GROUP7_ARRAY[@]}" run_build_group "Group 8 (LTS Tools J,M,N,P,Q)" "${BUILD_GROUP8}" "group8_build.log" "${GROUP8_ARRAY[@]}" run_build_group "Group 9 (LTS Tools R,S,T,V,W)" "${BUILD_GROUP9}" "group9_build.log" "${GROUP9_ARRAY[@]}" + run_build_group "Group 10 (LTS Projects)" "${BUILD_GROUP10}" "group10_build.log" "${GROUP10_ARRAY[@]}" + run_build_group "Group 11 (LTS Application)" "${BUILD_GROUP11}" "group11_build.log" "${GROUP11_ARRAY[@]}" else log_info "TESTS_ONLY enabled - skipping all build groups" fi @@ -918,6 +975,8 @@ docker run --rm \ -e GROUP7_TARGETS="${GROUP7_TARGETS_STRING}" \ -e GROUP8_TARGETS="${GROUP8_TARGETS_STRING}" \ -e GROUP9_TARGETS="${GROUP9_TARGETS_STRING}" \ + -e GROUP10_TARGETS="${GROUP10_TARGETS_STRING}" \ + -e GROUP11_TARGETS="${GROUP11_TARGETS_STRING}" \ -v "${WORKSPACE_ROOT_HOST}:/workspace" \ -v "${RTI_LICENSE_FILE_HOST}:/workspace/rti_license.dat" \ -v "${MIGRATE_PIPELINE_ROOT}/external:/workspace/external:ro" \