Merge feature/qt6-migration-basis-modules-merge-viewer-validation into feature/migrate-lts-projects-and-application
Cherry-picks5501d1e50(stub-header updates, superseded by4223ca2ffrelocation); resolves 1 content + 24 modify/delete conflicts; validates BUILD_RTI=ON BUILD_GRANTLEE=ON incl. Tools Groups 6-11.
This commit is contained in:
1295 files changed
+22136
-20217
No files matched your search
@@ -16,11 +16,13 @@ set -euo pipefail
|
||||
# - Optional disabling of ctest
|
||||
# - Optional tests-only mode
|
||||
# - Uses a temporary container-side script for robust execution
|
||||
# - Supersedes docker_build.sh: its full migrated-service target set, apt
|
||||
# package additions, and exclusion notes are merged into this script
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
usage() {
|
||||
cat <<'EOF'
|
||||
Usage: ./build.sh [ON|OFF] [options]
|
||||
Usage: ./new_docker_build.sh [ON|OFF] [options]
|
||||
|
||||
BUILD_RTI:
|
||||
First positional argument may be:
|
||||
@@ -33,11 +35,15 @@ BUILD_GRANTLEE:
|
||||
BUILD_ARCGIS:
|
||||
--arcgis / --no-arcgis Enable/disable BUILD_ARCGIS (default: OFF)
|
||||
|
||||
BUILD_CODIFICATION:
|
||||
--codification / --no-codification Enable/disable BUILD_CODIFICATION (default: OFF, requires KDReports)
|
||||
|
||||
Build groups:
|
||||
--group1 / --no-group1 Enable/disable DDS core libraries build
|
||||
--group2 / --no-group2 Enable/disable migration_tests build
|
||||
--group3 / --no-group3 Enable/disable remaining application targets build
|
||||
--group4 / --no-group4 Enable/disable Lts/Proxies module targets and tests only
|
||||
--group3 / --no-group3 Enable/disable remaining application and service targets build
|
||||
(NGL app targets + full migrated Lts service set with per-service tests)
|
||||
--group4 / --no-group4 Enable/disable DDS tests and Lts/Proxies module targets
|
||||
--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
|
||||
@@ -45,7 +51,7 @@ Build groups:
|
||||
--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)
|
||||
--build-viewer-only Build only Viewer module targets (skip Groups 1-4, implies --group5 --codification; ctest runs)
|
||||
|
||||
Test execution:
|
||||
--no-ctest Skip ctest execution
|
||||
@@ -56,6 +62,8 @@ Prebuilt Docker image usage:
|
||||
--use-prebuilt-image Use a Docker image with dependencies already installed
|
||||
--no-prebuilt-image Use base image and run apt-get install inside the container
|
||||
--docker-image IMAGE Docker image name to use/build/delete
|
||||
--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")
|
||||
|
||||
Prebuilt Docker image management:
|
||||
--build-prebuilt-image Build the prebuilt Docker image before running the build
|
||||
@@ -67,6 +75,7 @@ Environment variable overrides:
|
||||
BUILD_RTI=ON|OFF
|
||||
BUILD_GRANTLEE=ON|OFF
|
||||
BUILD_ARCGIS=ON|OFF
|
||||
BUILD_CODIFICATION=ON|OFF
|
||||
BUILD_GROUP1=ON|OFF
|
||||
BUILD_GROUP2=ON|OFF
|
||||
BUILD_GROUP3=ON|OFF
|
||||
@@ -96,6 +105,7 @@ Defaults:
|
||||
BUILD_RTI=ON
|
||||
BUILD_GRANTLEE=ON
|
||||
BUILD_ARCGIS=OFF
|
||||
BUILD_CODIFICATION=OFF
|
||||
BUILD_GROUP1=ON
|
||||
BUILD_GROUP2=ON
|
||||
BUILD_GROUP3=ON
|
||||
@@ -113,20 +123,20 @@ Defaults:
|
||||
USE_PREBUILT_IMAGE=OFF
|
||||
BUILD_PREBUILT_IMAGE=OFF
|
||||
DELETE_PREBUILT_IMAGE=OFF
|
||||
DOCKER_IMAGE=qt-migration-builder:latest
|
||||
DOCKER_IMAGE=legatus-qt6-prebuilt:latest
|
||||
|
||||
Examples:
|
||||
./build.sh
|
||||
./build.sh OFF
|
||||
./build.sh --no-group3
|
||||
./build.sh --no-group1 --group2 --no-group3
|
||||
./build.sh --no-ctest
|
||||
./build.sh --tests-only
|
||||
./build.sh --build-prebuilt-image --docker-image qt-migration-builder:latest
|
||||
./build.sh --use-prebuilt-image --docker-image qt-migration-builder:latest
|
||||
./build.sh --build-prebuilt-image --use-prebuilt-image --docker-image qt-migration-builder:latest
|
||||
./build.sh --delete-prebuilt-image --docker-image qt-migration-builder:latest
|
||||
./build.sh --use-prebuilt-image --no-group1 --no-group3 --integration-test
|
||||
./new_docker_build.sh
|
||||
./new_docker_build.sh OFF
|
||||
./new_docker_build.sh --no-group3
|
||||
./new_docker_build.sh --no-group1 --group2 --no-group3
|
||||
./new_docker_build.sh --no-ctest
|
||||
./new_docker_build.sh --tests-only
|
||||
./new_docker_build.sh --build-prebuilt-image --docker-image legatus-qt6-prebuilt:latest
|
||||
./new_docker_build.sh --use-prebuilt-image --docker-image legatus-qt6-prebuilt:latest
|
||||
./new_docker_build.sh --build-prebuilt-image --use-prebuilt-image --docker-image legatus-qt6-prebuilt:latest
|
||||
./new_docker_build.sh --delete-prebuilt-image --docker-image legatus-qt6-prebuilt:latest
|
||||
./new_docker_build.sh --use-prebuilt-image --no-group1 --no-group3 --integration-test
|
||||
EOF
|
||||
}
|
||||
|
||||
@@ -229,16 +239,21 @@ delete_prebuilt_image() {
|
||||
APT_PACKAGES=(
|
||||
build-essential
|
||||
cmake
|
||||
libboost-dev
|
||||
libkf6texttemplate-dev
|
||||
libqt6core6
|
||||
libqt6gui6
|
||||
libqt6widgets6
|
||||
libqt6sql6
|
||||
libqt6sql6-psql
|
||||
libqt6test6
|
||||
qt6-base-dev
|
||||
qt6-l10n-tools
|
||||
qt6-serialport-dev
|
||||
qt6-svg-dev
|
||||
qt6-tools-dev-tools
|
||||
qt6-tools-dev
|
||||
qt6-l10n-tools
|
||||
qt6-websockets-dev
|
||||
libgtest-dev
|
||||
libpq-dev
|
||||
postgresql-server-dev-all
|
||||
@@ -260,16 +275,56 @@ GROUP1_TARGETS=(
|
||||
ddsconnector
|
||||
)
|
||||
|
||||
GROUP4_TARGETS=(
|
||||
ddsGenericDataTests
|
||||
ddsDataTopicTests
|
||||
ddsFunctionTopicTests
|
||||
)
|
||||
|
||||
GROUP2_TARGETS=(
|
||||
migration_tests
|
||||
)
|
||||
|
||||
# Validation builds the full service set, not only the targets that
|
||||
# happened to be migrated first: every service library, the per-service
|
||||
# test executables, and the shared libraries they need. Targets that are
|
||||
# known blocked for reasons outside this migration are excluded below, so
|
||||
# a green run means every migratable service actually compiles.
|
||||
#
|
||||
# This is the full validation set formerly built by docker_build.sh, which
|
||||
# is superseded by this script.
|
||||
#
|
||||
# Excluded, each for a dependency this migration cannot supply:
|
||||
# svcTargetManagement - needs SituationMap::ElevationMap /
|
||||
# LineOfSightCalculation, the GDAL module
|
||||
# whose CMakeLists states it was never
|
||||
# migrated (main_handler.h:18 includes
|
||||
# <ElevationMap/elevation_map.h>).
|
||||
# svcExerciseManagement - needs QStateMachine / QState, moved from
|
||||
# svcInfrastructureManagement QtCore to the Qt SCXML module in Qt6
|
||||
# exmStateMachineTest (Qt6::StateMachine). No qt6-scxml-dev in
|
||||
# the image and qstatemachine.h is absent.
|
||||
# svcBuildings - its generated record_replay_plugin
|
||||
# (bld_record_replay_plugin.cpp) calls
|
||||
# fromQVariant() for the nested foreign
|
||||
# ProjectDataManagement types
|
||||
# VulnerabilityState /
|
||||
# StateChangeOriginator, for which no
|
||||
# specialization is generated (they are
|
||||
# not Buildings' own types), leaving the
|
||||
# generic fromQVariant template
|
||||
# undefined -> link error.
|
||||
# svcParticipantManagement - its record_replay custom header
|
||||
# (RecordReplay/ppm_record_replay_plugin_custom.h)
|
||||
# declares Q_INTERFACES(RecordReplay::
|
||||
# RecordReplayPlugin) on a class that also
|
||||
# inherits ParticipantHandling::BaseDataProvider
|
||||
# (a second Q_OBJECT base the other record_replay
|
||||
# custom plugins lack). Qt6's MOC reports
|
||||
# "Undefined interface" for the Q_INTERFACES in
|
||||
# that multi-Q_OBJECT-base context (RecordReplay::
|
||||
# RecordReplayPlugin is a Q_GADGET, not a Q_OBJECT),
|
||||
# so the plugin autogen step fails before link.
|
||||
# (The nested-foreign-PDM fromQVariant link error
|
||||
# that also applied is now resolved by the
|
||||
# fromQVariant primary-template body added to
|
||||
# svc_record_replay_plugin.cpp.grantlee.) The PPM
|
||||
# client/common/server libs still build; only this
|
||||
# exe is excluded.
|
||||
GROUP3_TARGETS=(
|
||||
NGLLogger
|
||||
nglapplication
|
||||
@@ -293,9 +348,174 @@ GROUP3_TARGETS=(
|
||||
svcPdmServer
|
||||
svcProjectDataManagement
|
||||
pdmTests
|
||||
# Migrated Lts services (full validation set merged from docker_build.sh)
|
||||
svcAesClient
|
||||
svcAesCommon
|
||||
svcAesServer
|
||||
svcAlmClient
|
||||
svcAlmCommon
|
||||
svcAlmServer
|
||||
svcAreaEffectSimulation
|
||||
svcAsmClient
|
||||
svcAsmCommon
|
||||
svcAsmServer
|
||||
svcAssetManagement
|
||||
svcAudioVideoManagement
|
||||
svcAvmClient
|
||||
svcAvmCommon
|
||||
svcAvmServer
|
||||
# svcBldServer builds in Group 4 (Proxies module)
|
||||
svcBldClient
|
||||
svcBldCommon
|
||||
svcCentralEffectSimulation
|
||||
svcCesClient
|
||||
svcCesCommon
|
||||
svcCesDDSCommon
|
||||
svcCesGeoPairingImpl
|
||||
svcCesServer
|
||||
svcCodClient
|
||||
svcCodCommon
|
||||
svcCodServer
|
||||
svcEemClient
|
||||
svcEemCommon
|
||||
svcEemServer
|
||||
svcEffectShowClient
|
||||
svcEscClient
|
||||
svcEscCommon
|
||||
svcEscServer
|
||||
svcEsmClient
|
||||
svcEsmCommon
|
||||
svcEsmServer
|
||||
svcEvlClient
|
||||
svcEvlCommon
|
||||
svcEvlServer
|
||||
svcExerciseEventManagement
|
||||
svcExmClient
|
||||
svcExmCommon
|
||||
svcExmServer
|
||||
svcFileManagement
|
||||
svcFilterManagement
|
||||
svcFlmClient
|
||||
svcFlmCommon
|
||||
svcFlmServer
|
||||
svcFltClient
|
||||
svcFltCommon
|
||||
svcFltServer
|
||||
svcGimClient
|
||||
svcGimCommon
|
||||
svcGimServer
|
||||
svcGmpServer
|
||||
svcGuezIedManagement
|
||||
svcIsmClient
|
||||
svcIsmCommon
|
||||
svcIsmServer
|
||||
svcMapDummy
|
||||
svcMdmClient
|
||||
svcMdmCommon
|
||||
svcMdmServer
|
||||
svcMessaging
|
||||
svcMeteoDataManagement
|
||||
svcMrkClient
|
||||
svcMrkCommon
|
||||
svcMrkServer
|
||||
svcMsgClient
|
||||
svcMsgCommon
|
||||
svcMsgServer
|
||||
svcNomClient
|
||||
svcNomCommon
|
||||
svcNomServer
|
||||
svcNotificationManagement
|
||||
svcNmeClient
|
||||
svcNmeCommon
|
||||
svcNmeServer
|
||||
svcNmeaManagement
|
||||
svcObdClient
|
||||
svcObdCommon
|
||||
svcObdServer
|
||||
svcOcBaseDownload
|
||||
svcOcSituationClient
|
||||
svcOcSituationServer
|
||||
svcOperatorManagement
|
||||
svcOpmClient
|
||||
svcOpmCommon
|
||||
svcOpmServer
|
||||
svcOreDummy
|
||||
svcOscClient
|
||||
svcOscCommon
|
||||
svcOscServer
|
||||
svcOssClient
|
||||
svcOssCommon
|
||||
svcOssServer
|
||||
svcPedDummy
|
||||
svcPpmClient
|
||||
svcPpmCommon
|
||||
svcPpmServer
|
||||
svcPreClient
|
||||
svcPreCommon
|
||||
svcPreServer
|
||||
svcPwsCommon
|
||||
svcRecCommon
|
||||
svcRecordingManagement
|
||||
svcRepClient
|
||||
svcRepCommon
|
||||
svcRepCommonExecutable
|
||||
svcRepServer
|
||||
svcReportAnalyzer
|
||||
svcReportGenerator
|
||||
svcScmClient
|
||||
svcScmCommon
|
||||
svcScmServer
|
||||
svcScrDummy
|
||||
svcServiceManagement
|
||||
svcSituationReplay
|
||||
svcSmoDummy
|
||||
svcSomClient
|
||||
svcSomCommon
|
||||
svcSomServer
|
||||
svcSoundManagement
|
||||
svcSrmCommon
|
||||
svcSrpClient
|
||||
svcSrpCommon
|
||||
svcSrpServer
|
||||
svcTgtClient
|
||||
svcTgtCommon
|
||||
svcTgtServer
|
||||
svcVideoOverlayManagement
|
||||
svcWarehouseGuez
|
||||
svcWhgClient
|
||||
svcWhgCommon
|
||||
svcWhgServer
|
||||
# Per-service tests (merged from docker_build.sh)
|
||||
asmTests
|
||||
avmFtTests
|
||||
avmTests
|
||||
avmVcaTests
|
||||
cesTests
|
||||
eemTests
|
||||
evlTests
|
||||
exmDtUnitTest
|
||||
exmTests
|
||||
flmTests
|
||||
gmpTests
|
||||
ismTests
|
||||
mrkTests
|
||||
mvsTests
|
||||
nomTests
|
||||
opmTests
|
||||
ppmTests
|
||||
preTests
|
||||
repTests
|
||||
scmDtUnitTest
|
||||
srpFtTests
|
||||
tgtTests
|
||||
whgTests
|
||||
)
|
||||
|
||||
GROUP4_TARGETS=(
|
||||
# DDS tests
|
||||
ddsGenericDataTests
|
||||
ddsDataTopicTests
|
||||
ddsFunctionTopicTests
|
||||
# Proxies module - Buildings
|
||||
BuildingControlCommon
|
||||
BuildingControlBsm
|
||||
@@ -315,20 +535,24 @@ GROUP4_TARGETS=(
|
||||
svcTabClient
|
||||
svcTabServer
|
||||
svcTrainingAreaBase
|
||||
tabPluginInterface
|
||||
TmsIfAdapterInterface
|
||||
TmsIfAdapter
|
||||
tabPluginUAS
|
||||
TabUASTest3
|
||||
TabUASTest4_2
|
||||
TabUASTest6
|
||||
# tabPluginInterface - defined in the CMake but no make rule is generated (base state)
|
||||
# TmsIfAdapterInterface/TmsIfAdapter/tabPluginUAS/TabUASTest3/TabUASTest4_2/TabUASTest6
|
||||
# - only built with BUILD_UAS_PROXY=ON (default OFF, not exposed by this script)
|
||||
# tabPluginInterface
|
||||
# TmsIfAdapterInterface
|
||||
# TmsIfAdapter
|
||||
# tabPluginUAS
|
||||
# TabUASTest3
|
||||
# TabUASTest4_2
|
||||
# TabUASTest6
|
||||
# Proxies module - TrainingAreaBaseOC
|
||||
svcTabocCommon
|
||||
svcTabocClient
|
||||
svcTabocServer
|
||||
svcTrainingAreaBaseOC
|
||||
serialtest
|
||||
# Proxies module - WirelessLocationSystem
|
||||
# Proxies module - WirelessLocationSystem (requires -DBUILD_WLS=ON, e.g. via
|
||||
# --cmake_build_flags "-DBUILD_WLS=ON")
|
||||
svcWirelessLocationSystem
|
||||
wlsJsonClientTest
|
||||
# Proxies module - Other
|
||||
@@ -380,6 +604,22 @@ RUN pip3 install --break-system-packages --quiet aqtinstall && \
|
||||
--outputdir ${QT_BASE_DIR} && \
|
||||
rm -rf /root/.cache/Aqt
|
||||
|
||||
# Install KDReports from source (apt package not available in Ubuntu 22.04/26.04)
|
||||
# Try apt install first (will fail), then build from KDAB GitHub mirror
|
||||
RUN apt-get install -y -qq libkdreports-dev 2>/dev/null || \
|
||||
(git clone --depth 1 https://github.com/KDAB/KDReports.git /tmp/KDReports && \
|
||||
cd /tmp/KDReports && \
|
||||
mkdir build && cd build && \
|
||||
cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_PREFIX_PATH=${QT_BASE_DIR} .. && \
|
||||
make -j$(nproc) && \
|
||||
make install && \
|
||||
cd / && rm -rf /tmp/KDReports)
|
||||
|
||||
# Legacy sources include <KDReports/...> but the Qt6 package installs headers flat
|
||||
# under /usr/local/include/KDReports-qt6 - alias the directory so the prefixed
|
||||
# includes resolve through the default /usr/local/include search path.
|
||||
RUN ln -sfn KDReports-qt6 /usr/local/include/KDReports
|
||||
|
||||
CMD ["/bin/bash"]
|
||||
EOF
|
||||
|
||||
@@ -421,9 +661,13 @@ source ".envrc"
|
||||
set +a
|
||||
|
||||
BUILD_ALL="${BUILD_ALL:-ON}"
|
||||
BUILD_SV="${BUILD_SV:-ON}"
|
||||
BUILD_WS="${BUILD_WS:-ON}"
|
||||
BUILD_AAR="${BUILD_AAR:-ON}"
|
||||
BUILD_RTI="${BUILD_RTI:-ON}"
|
||||
BUILD_GRANTLEE="${BUILD_GRANTLEE:-ON}"
|
||||
BUILD_ARCGIS="${BUILD_ARCGIS:-OFF}"
|
||||
BUILD_CODIFICATION="${BUILD_CODIFICATION:-OFF}"
|
||||
BUILD_GROUP1="${BUILD_GROUP1:-ON}"
|
||||
BUILD_GROUP2="${BUILD_GROUP2:-ON}"
|
||||
BUILD_GROUP3="${BUILD_GROUP3:-ON}"
|
||||
@@ -442,11 +686,6 @@ INTEGRATION_TEST="${INTEGRATION_TEST:-OFF}"
|
||||
USE_PREBUILT_IMAGE="${USE_PREBUILT_IMAGE:-OFF}"
|
||||
BUILD_PREBUILT_IMAGE="${BUILD_PREBUILT_IMAGE:-OFF}"
|
||||
DELETE_PREBUILT_IMAGE="${DELETE_PREBUILT_IMAGE:-OFF}"
|
||||
if [[ "${USE_PREBUILT_IMAGE}" == "ON" ]]; then
|
||||
DOCKER_IMAGE="${DOCKER_IMAGE:-qt-migration-builder:latest}"
|
||||
else
|
||||
DOCKER_IMAGE="${DOCKER_IMAGE:-ubuntu:26.04}"
|
||||
fi
|
||||
export QT_VERSION="${QT_VERSION:-6.10.2}"
|
||||
export QT_ARCH="${QT_ARCH:-linux_gcc_64}"
|
||||
# aqtinstall uses 'linux_gcc_64' but creates directory 'gcc_64'
|
||||
@@ -533,6 +772,7 @@ while [[ $# -gt 0 ]]; do
|
||||
--build-viewer-only)
|
||||
BUILD_VIEWER_ONLY=ON
|
||||
BUILD_GROUP5=ON
|
||||
BUILD_CODIFICATION=ON
|
||||
RUN_CTEST=ON
|
||||
;;
|
||||
--grantlee)
|
||||
@@ -547,6 +787,12 @@ while [[ $# -gt 0 ]]; do
|
||||
--no-arcgis)
|
||||
BUILD_ARCGIS=OFF
|
||||
;;
|
||||
--codification)
|
||||
BUILD_CODIFICATION=ON
|
||||
;;
|
||||
--no-codification)
|
||||
BUILD_CODIFICATION=OFF
|
||||
;;
|
||||
--no-ctest)
|
||||
RUN_CTEST=OFF
|
||||
;;
|
||||
@@ -573,6 +819,11 @@ while [[ $# -gt 0 ]]; do
|
||||
[[ $# -gt 0 ]] || die "--docker-image requires an image name"
|
||||
DOCKER_IMAGE="$1"
|
||||
;;
|
||||
--cmake_build_flags)
|
||||
shift
|
||||
[[ $# -gt 0 ]] || die "--cmake_build_flags requires a flag string"
|
||||
CMAKE_BUILD_FLAGS="$1"
|
||||
;;
|
||||
-h|--help)
|
||||
usage
|
||||
exit 0
|
||||
@@ -609,6 +860,7 @@ BUILD_ALL="$(normalize_on_off "$BUILD_ALL" "BUILD_ALL")"
|
||||
BUILD_RTI="$(normalize_on_off "$BUILD_RTI" "BUILD_RTI")"
|
||||
BUILD_GRANTLEE="$(normalize_on_off "$BUILD_GRANTLEE" "BUILD_GRANTLEE")"
|
||||
BUILD_ARCGIS="$(normalize_on_off "$BUILD_ARCGIS" "BUILD_ARCGIS")"
|
||||
BUILD_CODIFICATION="$(normalize_on_off "$BUILD_CODIFICATION" "BUILD_CODIFICATION")"
|
||||
BUILD_GROUP1="$(normalize_on_off "$BUILD_GROUP1" "BUILD_GROUP1")"
|
||||
BUILD_GROUP2="$(normalize_on_off "$BUILD_GROUP2" "BUILD_GROUP2")"
|
||||
BUILD_GROUP3="$(normalize_on_off "$BUILD_GROUP3" "BUILD_GROUP3")"
|
||||
@@ -628,29 +880,69 @@ USE_PREBUILT_IMAGE="$(normalize_on_off "$USE_PREBUILT_IMAGE" "USE_PREBUILT_IMAGE
|
||||
BUILD_PREBUILT_IMAGE="$(normalize_on_off "$BUILD_PREBUILT_IMAGE" "BUILD_PREBUILT_IMAGE")"
|
||||
DELETE_PREBUILT_IMAGE="$(normalize_on_off "$DELETE_PREBUILT_IMAGE" "DELETE_PREBUILT_IMAGE")"
|
||||
|
||||
# Set DOCKER_IMAGE default after argument parsing
|
||||
if [[ "${USE_PREBUILT_IMAGE}" == "ON" ]]; then
|
||||
DOCKER_IMAGE="${DOCKER_IMAGE:-legatus-qt6-prebuilt:latest}"
|
||||
else
|
||||
DOCKER_IMAGE="${DOCKER_IMAGE:-ubuntu:26.04}"
|
||||
fi
|
||||
|
||||
# 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_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
|
||||
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
|
||||
|
||||
# Group 5: Viewer module targets (conditional on BUILD_ARCGIS)
|
||||
# Note: LtsFileDialog excluded from viewer-only builds due to Group 4 dependencies (svcExmCommon, svcOpmCommon, svcFlmCommon)
|
||||
if [[ "${BUILD_ARCGIS}" == "ON" ]]; then
|
||||
GROUP5_TARGETS=(
|
||||
# Viewer module with ArcGIS
|
||||
situationMapCommon
|
||||
advancedSymbology
|
||||
advancedSymbologyXML
|
||||
LtsDataView
|
||||
LtsFileDialog
|
||||
LtsReportDisplay
|
||||
)
|
||||
if [[ "${BUILD_VIEWER_ONLY}" == "ON" ]]; then
|
||||
# Viewer-only build: exclude LtsFileDialog (requires Group 4 services)
|
||||
GROUP5_TARGETS=(
|
||||
# Viewer module with ArcGIS (viewer-only subset)
|
||||
situationMapCommon
|
||||
advancedSymbology
|
||||
advancedSymbologyXML
|
||||
LtsDataView
|
||||
LtsDataViewTest
|
||||
LtsReportDisplay
|
||||
)
|
||||
else
|
||||
GROUP5_TARGETS=(
|
||||
# Viewer module with ArcGIS (full build)
|
||||
situationMapCommon
|
||||
advancedSymbology
|
||||
advancedSymbologyXML
|
||||
LtsDataView
|
||||
LtsDataViewTest
|
||||
LtsFileDialog
|
||||
LtsFileDialogTest
|
||||
LtsReportDisplay
|
||||
)
|
||||
fi
|
||||
else
|
||||
GROUP5_TARGETS=(
|
||||
# Viewer module without ArcGIS (advancedSymbology requires ArcGIS)
|
||||
situationMapCommon
|
||||
advancedSymbologyXML
|
||||
LtsDataView
|
||||
LtsFileDialog
|
||||
LtsReportDisplay
|
||||
)
|
||||
if [[ "${BUILD_VIEWER_ONLY}" == "ON" ]]; then
|
||||
# Viewer-only build: exclude LtsFileDialog (requires Group 4 services)
|
||||
GROUP5_TARGETS=(
|
||||
# Viewer module without ArcGIS (viewer-only subset, advancedSymbology requires ArcGIS)
|
||||
situationMapCommon
|
||||
advancedSymbologyXML
|
||||
LtsDataView
|
||||
LtsDataViewTest
|
||||
LtsReportDisplay
|
||||
)
|
||||
else
|
||||
GROUP5_TARGETS=(
|
||||
# Viewer module without ArcGIS (full build)
|
||||
situationMapCommon
|
||||
advancedSymbologyXML
|
||||
LtsDataView
|
||||
LtsDataViewTest
|
||||
LtsFileDialog
|
||||
LtsFileDialogTest
|
||||
LtsReportDisplay
|
||||
)
|
||||
fi
|
||||
fi
|
||||
|
||||
# Group 6: LTS Tools (Qt6 migration targets)
|
||||
@@ -750,7 +1042,10 @@ fi
|
||||
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 3 (application + service targets)" "$BUILD_GROUP3"
|
||||
log_group "Build Group 4 (DDS tests + Proxies)" "$BUILD_GROUP4"
|
||||
log_group "Build Group 5 (Viewer)" "$BUILD_GROUP5"
|
||||
log_group "Build Group 6 (LTS Tools)" "$BUILD_GROUP6"
|
||||
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"
|
||||
@@ -775,7 +1070,7 @@ if [[ "${BUILD_PREBUILT_IMAGE}" == "ON" ]]; then
|
||||
log_info "Prebuilt image was built successfully."
|
||||
log_info "Exiting because --use-prebuilt-image was not requested."
|
||||
log_info "To use it, run:"
|
||||
printf ' ./build.sh --use-prebuilt-image --docker-image %q\n' "${DOCKER_IMAGE}"
|
||||
printf ' ./new_docker_build.sh --use-prebuilt-image --docker-image %q\n' "${DOCKER_IMAGE}"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
@@ -808,6 +1103,9 @@ set -euo pipefail
|
||||
# Default variable assignments to prevent unbound variable errors
|
||||
USE_PREBUILT_IMAGE="${USE_PREBUILT_IMAGE:-OFF}"
|
||||
BUILD_ALL="${BUILD_ALL:-ON}"
|
||||
BUILD_SV="${BUILD_SV:-ON}"
|
||||
BUILD_WS="${BUILD_WS:-ON}"
|
||||
BUILD_AAR="${BUILD_AAR:-ON}"
|
||||
BUILD_RTI="${BUILD_RTI:-ON}"
|
||||
BUILD_GRANTLEE="${BUILD_GRANTLEE:-ON}"
|
||||
BUILD_ARCGIS="${BUILD_ARCGIS:-OFF}"
|
||||
@@ -901,12 +1199,19 @@ cd build4
|
||||
|
||||
cmake .. \
|
||||
-DBUILD_TESTING=ON \
|
||||
-DBUILD_ALL="${BUILD_ALL}" \
|
||||
-DBUILD_SV="${BUILD_SV}" \
|
||||
-DBUILD_WS="${BUILD_WS}" \
|
||||
-DBUILD_AAR="${BUILD_AAR}" \
|
||||
-DBUILD_RTI="${BUILD_RTI}" \
|
||||
-DBUILD_VIEWER_ONLY="${BUILD_VIEWER_ONLY}" \
|
||||
-DBUILD_GRANTLEE="${BUILD_GRANTLEE}" \
|
||||
-DBUILD_ARCGIS="${BUILD_ARCGIS}" \
|
||||
-DBUILD_CODIFICATION="${BUILD_CODIFICATION}" \
|
||||
${CMAKE_BUILD_FLAGS:-} \
|
||||
-DCMAKE_CXX_STANDARD=17 \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-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}"
|
||||
-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"
|
||||
|
||||
read -r -a GROUP1_ARRAY <<< "${GROUP1_TARGETS}"
|
||||
read -r -a GROUP2_ARRAY <<< "${GROUP2_TARGETS}"
|
||||
@@ -927,12 +1232,12 @@ if [[ "${TESTS_ONLY}" != "ON" ]]; then
|
||||
BUILD_GROUP2=OFF
|
||||
BUILD_GROUP3=OFF
|
||||
BUILD_GROUP4=OFF
|
||||
BUILD_GROUP5=ON
|
||||
fi
|
||||
run_build_group "Group 1" "${BUILD_GROUP1}" "group1_build.log" "${GROUP1_ARRAY[@]}"
|
||||
run_build_group "Group 4 (DDS Tests)" "${BUILD_GROUP4}" "group4_build.log" "${GROUP4_ARRAY[@]}"
|
||||
run_build_group "Group 4 (DDS tests + Proxies)" "${BUILD_GROUP4}" "group4_build.log" "${GROUP4_ARRAY[@]}"
|
||||
run_build_group "Group 2" "${BUILD_GROUP2}" "group2_build.log" "${GROUP2_ARRAY[@]}"
|
||||
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[@]}"
|
||||
run_build_group "Group 7 (LTS Tools A,B,C,E,I)" "${BUILD_GROUP7}" "group7_build.log" "${GROUP7_ARRAY[@]}"
|
||||
@@ -963,9 +1268,14 @@ docker run --rm \
|
||||
-e MIGRATE_PIPELINE_ROOT \
|
||||
-e LANG \
|
||||
-e LC_ALL \
|
||||
-e BUILD_ALL \
|
||||
-e BUILD_SV \
|
||||
-e BUILD_WS \
|
||||
-e BUILD_AAR \
|
||||
-e BUILD_RTI \
|
||||
-e BUILD_GRANTLEE \
|
||||
-e BUILD_ARCGIS \
|
||||
-e BUILD_CODIFICATION \
|
||||
-e BUILD_GROUP1 \
|
||||
-e BUILD_GROUP2 \
|
||||
-e BUILD_GROUP3 \
|
||||
@@ -982,6 +1292,7 @@ docker run --rm \
|
||||
-e TESTS_ONLY \
|
||||
-e INTEGRATION_TEST \
|
||||
-e USE_PREBUILT_IMAGE \
|
||||
-e CMAKE_BUILD_FLAGS \
|
||||
-e QT_VERSION \
|
||||
-e QT_ARCH \
|
||||
-e QT_ARCH_DIR \
|
||||
|
||||
Reference in new issue
Block a user