Merge feature/Re-implement-XmlPatterns into action/merge-regress-arcgis-symbolo-with-reimplement-xmlpattern
Integrates the XmlPatterns reimplementation branch which: - Re-implements MSDL/SAAB import without Qt XmlPatterns using Qt6 QDomDocument - Adds xsdcxx and XercesC dependencies for MSDL plugin - Adds Schusstafel and KDChart resolution functions - Enables BUILD_WLS, BUILD_FILTERMANAGEMENT, BUILD_PLUGINS_SERVICEMONITOR, BUILD_WEBENGINE_PLUGINS, and BUILD_XMLPATTERNS_PLUGINS options - Updates GROUP4 to include svcWirelessLocationSystem and wlsJsonClientTest by default - Fixes Qt6 API changes (QStringRef removal, etc.) Conflict resolutions: - visitors.cpp: Kept Qt6-compatible QString code (no QStringView include needed) - new_docker_build.sh: Merged new build options and resolution functions
This commit is contained in:
53 files changed
+940
-531
No files matched your search
@@ -36,7 +36,36 @@ BUILD_ARCGIS:
|
||||
--arcgis / --no-arcgis Enable/disable BUILD_ARCGIS (default: OFF)
|
||||
|
||||
BUILD_CODIFICATION:
|
||||
--codification / --no-codification Enable/disable BUILD_CODIFICATION (default: OFF, requires KDReports)
|
||||
--codification / --no-codification Enable/disable BUILD_CODIFICATION (default: ON, requires KDReports)
|
||||
|
||||
BUILD_WLS:
|
||||
--wls / --no-wls Enable/disable BUILD_WLS (default: ON; the
|
||||
GROUP4 targets svcWirelessLocationSystem /
|
||||
wlsJsonClientTest only exist when it is ON)
|
||||
|
||||
BUILD_FILTERMANAGEMENT:
|
||||
--filtermanagement / --no-filtermanagement Enable/disable BUILD_FILTERMANAGEMENT (default: ON)
|
||||
|
||||
BUILD_PLUGINS_SERVICEMONITOR:
|
||||
--servicemonitor / --no-servicemonitor Enable/disable BUILD_PLUGINS_SERVICEMONITOR (default: ON)
|
||||
|
||||
BUILD_WEBENGINE_PLUGINS:
|
||||
--webengine-plugins / --no-webengine-plugins
|
||||
Enable/disable the WebEngine-based plugins (PlanEditor,
|
||||
OnlineHelp, ParticipantOrgChart). PlanEditor links
|
||||
situationMap, so ON promotes BUILD_ARCGIS to ON. (default: ON)
|
||||
|
||||
BUILD_XMLPATTERNS_PLUGINS:
|
||||
--xmlpatterns-plugins / --no-xmlpatterns-plugins
|
||||
Enable/disable the MSDL/Saab plugins. They no longer
|
||||
require Qt XmlPatterns (removed in Qt 6.0, not
|
||||
re-introduced): their import logic was re-implemented
|
||||
with Qt6::Xml (QDomDocument) + the existing xmllint
|
||||
step, and MSDL additionally links XercesC + uses
|
||||
xsdc++-generated tree classes (needs xsdcxx +
|
||||
libxerces-c-dev, both in APT_PACKAGES). With the
|
||||
prerequisites present these build by default.
|
||||
(default: ON)
|
||||
|
||||
Build groups:
|
||||
--group1 / --no-group1 Enable/disable DDS core libraries build
|
||||
@@ -81,6 +110,11 @@ Environment variable overrides:
|
||||
BUILD_GRANTLEE=ON|OFF
|
||||
BUILD_ARCGIS=ON|OFF
|
||||
BUILD_CODIFICATION=ON|OFF
|
||||
BUILD_FILTERMANAGEMENT=ON|OFF
|
||||
BUILD_WLS=ON|OFF
|
||||
BUILD_PLUGINS_SERVICEMONITOR=ON|OFF
|
||||
BUILD_WEBENGINE_PLUGINS=ON|OFF
|
||||
BUILD_XMLPATTERNS_PLUGINS=ON|OFF
|
||||
BUILD_GROUP1=ON|OFF
|
||||
BUILD_GROUP2=ON|OFF
|
||||
BUILD_GROUP3=ON|OFF
|
||||
@@ -112,7 +146,12 @@ Defaults:
|
||||
BUILD_RTI=ON
|
||||
BUILD_GRANTLEE=ON
|
||||
BUILD_ARCGIS=OFF
|
||||
BUILD_CODIFICATION=OFF
|
||||
BUILD_CODIFICATION=ON
|
||||
BUILD_FILTERMANAGEMENT=ON
|
||||
BUILD_WLS=ON
|
||||
BUILD_PLUGINS_SERVICEMONITOR=ON
|
||||
BUILD_WEBENGINE_PLUGINS=ON
|
||||
BUILD_XMLPATTERNS_PLUGINS=ON
|
||||
BUILD_GROUP1=ON
|
||||
BUILD_GROUP2=ON
|
||||
BUILD_GROUP3=ON
|
||||
@@ -153,6 +192,10 @@ log_info() {
|
||||
printf 'INFO: %s\n' "$*"
|
||||
}
|
||||
|
||||
log_warn() {
|
||||
printf 'WARNING: %s\n' "$*" >&2
|
||||
}
|
||||
|
||||
log_error() {
|
||||
printf 'ERROR: %s\n' "$*" >&2
|
||||
}
|
||||
@@ -270,6 +313,25 @@ APT_PACKAGES=(
|
||||
vlc-plugin-base
|
||||
git
|
||||
python3-pip
|
||||
# Poppler-Qt6 (PDF support): Z/src/nglwidgets detects it via
|
||||
# pkg_check_modules(POPPLER_QT6 poppler-qt6) - pkg-config must be present for
|
||||
# the probe to run at all. FlmExplorerGuiPlugin's flm_preview_playback.cpp
|
||||
# uses Poppler types unconditionally, so a green Group 12 build requires it.
|
||||
pkg-config
|
||||
libpoppler-qt6-dev
|
||||
# MSDL/Saab no longer require Qt XmlPatterns (removed in Qt 6.0): their import
|
||||
# logic was re-implemented with Qt6::Xml (QDomDocument) + the existing xmllint
|
||||
# schema-validation step. MSDL additionally links XercesC and uses xsdc++-
|
||||
# generated tree classes, so it needs libxerces-c-dev (XercesC C++ parser) and
|
||||
# xsdcxx (the xsdc++ code generator, XSD_GENERATE_TREE). Saab only needs
|
||||
# Qt6::Xml; both are installed together so the two plugins build from the same
|
||||
# image.
|
||||
xsdcxx
|
||||
libxerces-c-dev
|
||||
# xmllint (libxml2-utils): the MSDL import validates the incoming document against
|
||||
# its XSD via an external `xmllint --schema` step (QProcess) - pre-existing in the
|
||||
# legacy (msdl_import.cpp). Provision it so that runtime schema check can run.
|
||||
libxml2-utils
|
||||
)
|
||||
|
||||
# INTERFACE libraries (header-only) are built automatically as dependencies
|
||||
@@ -560,10 +622,10 @@ GROUP4_TARGETS=(
|
||||
svcTabocServer
|
||||
svcTrainingAreaBaseOC
|
||||
serialtest
|
||||
# Proxies module - WirelessLocationSystem (requires -DBUILD_WLS=ON, e.g. via
|
||||
# --cmake_build_flags "-DBUILD_WLS=ON")
|
||||
# svcWirelessLocationSystem
|
||||
# wlsJsonClientTest
|
||||
# Proxies module - WirelessLocationSystem (only exists when BUILD_WLS=ON,
|
||||
# script default; see the --wls flag)
|
||||
svcWirelessLocationSystem
|
||||
wlsJsonClientTest
|
||||
# Proxies module - Other
|
||||
svcCmoCommon
|
||||
svcCmoClient
|
||||
@@ -613,6 +675,13 @@ RUN pip3 install --break-system-packages --quiet aqtinstall && \
|
||||
--outputdir ${QT_BASE_DIR} && \
|
||||
rm -rf /root/.cache/Aqt
|
||||
|
||||
# MSDL/Saab plugins: Qt removed the XmlPatterns module in Qt 6.0 (not re-
|
||||
# introduced), so their import logic was re-implemented with Qt6::Xml
|
||||
# (QDomDocument) + the existing external xmllint schema-validation step. MSDL
|
||||
# additionally links XercesC and uses xsdc++-generated tree classes; xsdcxx +
|
||||
# libxerces-c-dev are installed via APT_PACKAGES above, so the plugins build with
|
||||
# a stock Qt 6.10.2 install.
|
||||
|
||||
# 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 || \
|
||||
@@ -629,6 +698,31 @@ RUN apt-get install -y -qq libkdreports-dev 2>/dev/null || \
|
||||
# includes resolve through the default /usr/local/include search path.
|
||||
RUN ln -sfn KDReports-qt6 /usr/local/include/KDReports
|
||||
|
||||
# KDChart (KDAB, MIT) from source: FindKDChart RETURN()s without it, which skips
|
||||
# OreOnlineReportsGuiPlugin (app requirement iid ore.onlinereports). The legacy
|
||||
# env had a KDChart 2.6.0 Qt5 RPM; the Qt6 build needs a Qt6-compatible release.
|
||||
# Pinned to the verified kdchart-3.0.0 tag (KDChart_QT6=true; needs the
|
||||
# Gui/Widgets/PrintSupport/Svg Qt6 components above). ECM
|
||||
# (extra-cmake-modules) is required: KDChart plain-include()s ECMGeneratePriFile
|
||||
# for Qt > 6.2 and never find_package(ECM)s.
|
||||
RUN apt-get update -qq && \
|
||||
apt-get install -y -qq extra-cmake-modules && \
|
||||
rm -rf /var/lib/apt/lists/* && \
|
||||
git clone --depth 1 --branch kdchart-3.0.0 https://github.com/KDAB/KDChart.git /tmp/KDChart && \
|
||||
cmake -S /tmp/KDChart -B /tmp/KDChart/build \
|
||||
-DKDChart_QT6=true -DKDChart_EXAMPLES=false -DKDChart_TESTS=false -DKDChart_DOCS=false \
|
||||
-DCMAKE_PREFIX_PATH=${QT_BASE_DIR}/${QT_VERSION}/${QT_ARCH_DIR} \
|
||||
-DCMAKE_MODULE_PATH=/usr/share/ECM/modules \
|
||||
-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local && \
|
||||
cmake --build /tmp/KDChart/build -j$(nproc) && \
|
||||
cmake --install /tmp/KDChart/build && \
|
||||
ldconfig && \
|
||||
rm -rf /tmp/KDChart
|
||||
|
||||
# KDChart's Qt6 build installs headers under KDChart-qt6 (same -qt6 suffix
|
||||
# pattern as KDReports); legacy sources include the <KDChart/...> prefix.
|
||||
RUN ln -sfn KDChart-qt6 /usr/local/include/KDChart
|
||||
|
||||
CMD ["/bin/bash"]
|
||||
EOF
|
||||
|
||||
@@ -676,7 +770,12 @@ 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_CODIFICATION="${BUILD_CODIFICATION:-ON}"
|
||||
BUILD_FILTERMANAGEMENT="${BUILD_FILTERMANAGEMENT:-ON}"
|
||||
BUILD_WLS="${BUILD_WLS:-ON}"
|
||||
BUILD_PLUGINS_SERVICEMONITOR="${BUILD_PLUGINS_SERVICEMONITOR:-ON}"
|
||||
BUILD_WEBENGINE_PLUGINS="${BUILD_WEBENGINE_PLUGINS:-ON}"
|
||||
BUILD_XMLPATTERNS_PLUGINS="${BUILD_XMLPATTERNS_PLUGINS:-ON}"
|
||||
BUILD_GROUP1="${BUILD_GROUP1:-ON}"
|
||||
BUILD_GROUP2="${BUILD_GROUP2:-ON}"
|
||||
BUILD_GROUP3="${BUILD_GROUP3:-ON}"
|
||||
@@ -812,6 +911,36 @@ while [[ $# -gt 0 ]]; do
|
||||
--no-codification)
|
||||
BUILD_CODIFICATION=OFF
|
||||
;;
|
||||
--wls)
|
||||
BUILD_WLS=ON
|
||||
;;
|
||||
--no-wls)
|
||||
BUILD_WLS=OFF
|
||||
;;
|
||||
--filtermanagement)
|
||||
BUILD_FILTERMANAGEMENT=ON
|
||||
;;
|
||||
--no-filtermanagement)
|
||||
BUILD_FILTERMANAGEMENT=OFF
|
||||
;;
|
||||
--servicemonitor)
|
||||
BUILD_PLUGINS_SERVICEMONITOR=ON
|
||||
;;
|
||||
--no-servicemonitor)
|
||||
BUILD_PLUGINS_SERVICEMONITOR=OFF
|
||||
;;
|
||||
--webengine-plugins)
|
||||
BUILD_WEBENGINE_PLUGINS=ON
|
||||
;;
|
||||
--no-webengine-plugins)
|
||||
BUILD_WEBENGINE_PLUGINS=OFF
|
||||
;;
|
||||
--xmlpatterns-plugins)
|
||||
BUILD_XMLPATTERNS_PLUGINS=ON
|
||||
;;
|
||||
--no-xmlpatterns-plugins)
|
||||
BUILD_XMLPATTERNS_PLUGINS=OFF
|
||||
;;
|
||||
--no-ctest)
|
||||
RUN_CTEST=OFF
|
||||
;;
|
||||
@@ -885,6 +1014,18 @@ 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_FILTERMANAGEMENT="$(normalize_on_off "$BUILD_FILTERMANAGEMENT" "BUILD_FILTERMANAGEMENT")"
|
||||
BUILD_WLS="$(normalize_on_off "$BUILD_WLS" "BUILD_WLS")"
|
||||
BUILD_PLUGINS_SERVICEMONITOR="$(normalize_on_off "$BUILD_PLUGINS_SERVICEMONITOR" "BUILD_PLUGINS_SERVICEMONITOR")"
|
||||
BUILD_WEBENGINE_PLUGINS="$(normalize_on_off "$BUILD_WEBENGINE_PLUGINS" "BUILD_WEBENGINE_PLUGINS")"
|
||||
BUILD_XMLPATTERNS_PLUGINS="$(normalize_on_off "$BUILD_XMLPATTERNS_PLUGINS" "BUILD_XMLPATTERNS_PLUGINS")"
|
||||
|
||||
# PlanEditorGuiPlugin links situationMap (ArcGIS scope), so the WebEngine plugin
|
||||
# set cannot configure without ArcGIS: promote BUILD_ARCGIS when it is enabled.
|
||||
if [[ "${BUILD_WEBENGINE_PLUGINS}" == "ON" && "${BUILD_ARCGIS}" == "OFF" ]]; then
|
||||
log_info "BUILD_WEBENGINE_PLUGINS=ON implies ArcGIS-scope targets (PlanEditorGuiPlugin -> situationMap): promoting BUILD_ARCGIS=ON"
|
||||
BUILD_ARCGIS=ON
|
||||
fi
|
||||
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")"
|
||||
@@ -922,7 +1063,7 @@ DOCKER_MOUNT_ROOT="${DOCKER_MOUNT_ROOT:-/repo}"
|
||||
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 DOCKER_MOUNT_ROOT
|
||||
export BUILD_ALL BUILD_RTI BUILD_GRANTLEE BUILD_ARCGIS BUILD_CODIFICATION BUILD_FILTERMANAGEMENT BUILD_WLS BUILD_PLUGINS_SERVICEMONITOR BUILD_WEBENGINE_PLUGINS BUILD_XMLPATTERNS_PLUGINS BUILD_GROUP1 BUILD_GROUP2 BUILD_GROUP3 BUILD_GROUP4 BUILD_GROUP5 BUILD_GROUP6 BUILD_GROUP7 BUILD_GROUP8 BUILD_GROUP9 BUILD_GROUP10 BUILD_GROUP11 BUILD_GROUP12 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)
|
||||
@@ -1153,8 +1294,33 @@ GROUP11_TARGETS=(
|
||||
# without these the app reports "App Requirements check failed" at startup.
|
||||
# Plugin outputs land in build4/lib, the directory the loader scans.
|
||||
# Excluded (environmental floors, not migration regressions):
|
||||
# cesPluginGeoPairing - needs the external Schusstafel.h header (missing)
|
||||
# cesPluginGeoPairing - needs the external Schusstafel package (prebuilt
|
||||
# Schusstafel.h + libSchusstafel.so) at
|
||||
# external/Schusstafel (see resolve_schusstafel); it is
|
||||
# built when the package is present
|
||||
# OreOnlineReportsGuiPlugin - needs KDChart (open-source, KDAB) under
|
||||
# /usr/local; built from github.com/KDAB/KDChart tag
|
||||
# kdchart-3.0.0 with -DKDChart_QT6=true (see
|
||||
# resolve_kdchart), built when present
|
||||
# BldInfoGuiPlugin - links BuildingViewerCommon (dtEntity/OSG SDK absent)
|
||||
# BdvViewerGuiPlugin - links BuildingViewerCommon (same floor; CMake skips its
|
||||
# subdirectory when BuildingViewerCommon is not built)
|
||||
# PpmMSDLGuiPlugin / - former XmlPatterns floor, now CLOSED: re-implemented without
|
||||
# PpmSAABGuiPlugin - Qt XmlPatterns (removed in Qt 6.0) using Qt6::Xml (QDomDocument)
|
||||
# + the existing xmllint step; MSDL also needs xsdcxx +
|
||||
# libxerces-c-dev (both in APT_PACKAGES). Now in GROUP12 and built
|
||||
# by default when the prerequisites are present (see
|
||||
# resolve_xmlpatterns)
|
||||
# The Flt*/Smo* targets only exist when BUILD_FILTERMANAGEMENT /
|
||||
# BUILD_PLUGINS_SERVICEMONITOR are ON (script defaults; see the cmake call).
|
||||
# With them OFF the five unconditional GUI plugins (EvlEdit, PpmParticipantInfo,
|
||||
# Pws, SrmReplayManagement, OpmSettings) also fail to link (they need the
|
||||
# FilterManagement interface libs) - so these defaults are load-bearing.
|
||||
# The PlanEditorGuiPlugin/OhpOnlineHelpViewerGuiPlugin/PpmOrgChartGuiPlugin
|
||||
# targets only exist when BUILD_WEBENGINE_PLUGINS=ON (script default; ON also
|
||||
# promotes BUILD_ARCGIS=ON because PlanEditorGuiPlugin links situationMap),
|
||||
# and the Cod*/codTopicTypePlugin targets when BUILD_CODIFICATION=ON (script
|
||||
# default; requires KDReports).
|
||||
GROUP12_TARGETS=(
|
||||
AesAirSupportGuiPlugin
|
||||
AesBcContaminationGuiPlugin
|
||||
@@ -1192,6 +1358,8 @@ GROUP12_TARGETS=(
|
||||
CesParticipantMoveGuiPlugin
|
||||
CesParticipantUASGuiPlugin
|
||||
CmoDataPlugin
|
||||
CodCodificationDataGuiPlugin
|
||||
CodDataPlugin
|
||||
DevGuiPlugin
|
||||
EfmDataPlugin
|
||||
EfmSoundAreaGuiPlugin
|
||||
@@ -1209,6 +1377,10 @@ GROUP12_TARGETS=(
|
||||
FlmComboBoxGuiPlugin
|
||||
FlmDataPlugin
|
||||
FlmExplorerGuiPlugin
|
||||
FltAesGuiPlugin
|
||||
FltDataPlugin
|
||||
FltParticipantGuiPlugin
|
||||
Fltbldg_cmpntGuiPlugin
|
||||
FspGuiPlugin
|
||||
GimDataPlugin
|
||||
GimInfoGuiPlugin
|
||||
@@ -1235,12 +1407,14 @@ GROUP12_TARGETS=(
|
||||
NomEditGuiPlugin
|
||||
ObdBaseDownloaderGuiPlugin
|
||||
ObdDataPlugin
|
||||
OhpOnlineHelpViewerGuiPlugin
|
||||
OpmComboBoxGuiPlugin
|
||||
OpmDataPlugin
|
||||
OpmEditGuiPlugin
|
||||
OpmLoginGuiPlugin
|
||||
OpmOverviewGuiPlugin
|
||||
OpmSettingsGuiPlugin
|
||||
OreOnlineReportsGuiPlugin
|
||||
OscDataPlugin
|
||||
OscParticipantInfoGuiPlugin
|
||||
OscSystemGuiPlugin
|
||||
@@ -1248,14 +1422,18 @@ GROUP12_TARGETS=(
|
||||
PdmChargeTableGuiPlugin
|
||||
PdmComboBoxGuiPlugin
|
||||
PdmDataPlugin
|
||||
PlanEditorGuiPlugin
|
||||
PlanOverlaysGuiPlugin
|
||||
PpmComboBoxGuiPlugin
|
||||
PpmDataPlugin
|
||||
PpmMSDLGuiPlugin
|
||||
PpmOperationalPlaningGuiPlugin
|
||||
PpmOrgChartGuiPlugin
|
||||
PpmParticipantEditGuiPlugin
|
||||
PpmParticipantInfoGuiPlugin
|
||||
PpmParticipantTemplatesGuiPlugin
|
||||
PpmPartyEditGuiPlugin
|
||||
PpmSAABGuiPlugin
|
||||
PpmTypeEditGuiPlugin
|
||||
PpmUasGuiPlugin
|
||||
PreDataPlugin
|
||||
@@ -1282,6 +1460,10 @@ GROUP12_TARGETS=(
|
||||
ScrScreenRecordingGuiPlugin
|
||||
SitmapGuiPlugin
|
||||
SituationMapScriptFilterGuiPlugin
|
||||
SmoEquipmentErrorRegistrationGuiPlugin
|
||||
SmoHgrAndMineSearchGuiPlugin
|
||||
SmoMonitorsGuiPlugin
|
||||
SmoSystemMonitorGuiPlugin
|
||||
SrmDataPlugin
|
||||
SrmReplayManagementGuiPlugin
|
||||
SrpDataPlugin
|
||||
@@ -1319,6 +1501,7 @@ GROUP12_TARGETS=(
|
||||
cesPluginCES_NBC
|
||||
cesPluginCesBuildings
|
||||
cesPluginExplosions
|
||||
cesPluginGeoPairing
|
||||
cesPluginMineAreas
|
||||
cesPluginMineLayingArtillery
|
||||
cesPluginParticipantBuildings
|
||||
@@ -1466,6 +1649,7 @@ BUILD_AAR="${BUILD_AAR:-ON}"
|
||||
BUILD_RTI="${BUILD_RTI:-ON}"
|
||||
BUILD_GRANTLEE="${BUILD_GRANTLEE:-ON}"
|
||||
BUILD_ARCGIS="${BUILD_ARCGIS:-OFF}"
|
||||
WITH_SCHUSSTAFEL="${WITH_SCHUSSTAFEL:-ON}"
|
||||
BUILD_GROUP1="${BUILD_GROUP1:-ON}"
|
||||
BUILD_GROUP2="${BUILD_GROUP2:-ON}"
|
||||
BUILD_GROUP3="${BUILD_GROUP3:-ON}"
|
||||
@@ -1488,6 +1672,10 @@ log_info() {
|
||||
printf 'INFO: %s\n' "$*"
|
||||
}
|
||||
|
||||
log_warn() {
|
||||
printf 'WARNING: %s\n' "$*" >&2
|
||||
}
|
||||
|
||||
install_qt6_packages() {
|
||||
log_info "Installing Qt6 packages via aqtinstall"
|
||||
|
||||
@@ -1593,6 +1781,65 @@ if [[ "${BUILD_ARCGIS}" == "ON" ]]; then
|
||||
fi
|
||||
fi
|
||||
|
||||
# The MSDL/Saab plugins no longer require Qt XmlPatterns (removed in Qt 6.0, not
|
||||
# re-introduced). Their import logic was re-implemented with Qt6::Xml
|
||||
# (QDomDocument) plus the existing external xmllint schema-validation step; MSDL
|
||||
# additionally links XercesC and uses xsdc++-generated tree classes. So build
|
||||
# them by default. MSDL needs the xsdcxx code generator + libxerces-c-dev (both
|
||||
# are in APT_PACKAGES); if they are missing here, keep both plugins OFF and flag
|
||||
# the gap. (Saab only needs Qt6::Xml, but is gated together to keep the effective
|
||||
# value a single switch.)
|
||||
resolve_xmlpatterns() {
|
||||
BUILD_XMLPATTERNS_EFFECTIVE="${BUILD_XMLPATTERNS_PLUGINS}"
|
||||
if [[ "${BUILD_XMLPATTERNS_EFFECTIVE}" == "ON" ]]; then
|
||||
if command -v xsdcxx >/dev/null 2>&1 && [ -e /usr/lib/x86_64-linux-gnu/libxerces-c.so ]; then
|
||||
log_info "xsdcxx + XercesC present - MSDL/Saab plugins will be built (re-implemented without Qt XmlPatterns)"
|
||||
else
|
||||
log_warn "xsdcxx / libxerces-c-dev missing - keeping BUILD_PLUGINS_MSDL/BUILD_PLUGINS_SAAB OFF (ppm.msdl / ppm.saab stay unbuilt)"
|
||||
BUILD_XMLPATTERNS_EFFECTIVE=OFF
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
resolve_xmlpatterns
|
||||
|
||||
# Schusstafel is a prebuilt external package (Schusstafel.h +
|
||||
# libSchusstafel.so) provided at external/Schusstafel, mirroring the ArcGIS
|
||||
# symlink pattern. cesPluginGeoPairing #includes Schusstafel.h unconditionally,
|
||||
# so without the package WITH_SCHUSSTAFEL stays OFF and the target is dropped
|
||||
# from Group 12 (environmental floor, not a migration regression).
|
||||
resolve_schusstafel() {
|
||||
WITH_SCHUSSTAFEL_EFFECTIVE="${WITH_SCHUSSTAFEL}"
|
||||
if [[ "${WITH_SCHUSSTAFEL_EFFECTIVE}" == "ON" ]]; then
|
||||
if ls /workspace/external/Schusstafel/Schusstafel.h >/dev/null 2>&1; then
|
||||
log_info "Schusstafel present at /workspace/external/Schusstafel - cesPluginGeoPairing will be built"
|
||||
else
|
||||
log_warn "Schusstafel not present at /workspace/external/Schusstafel - keeping WITH_SCHUSSTAFEL OFF (cesPluginGeoPairing stays unbuilt)"
|
||||
WITH_SCHUSSTAFEL_EFFECTIVE=OFF
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
# KDChart (KDAB, MIT) is an open-source Qt charts extension, installed under
|
||||
# /usr/local (header KDChart/kdchart_export.h + libkdchart.so; FindKDChart
|
||||
# searches /usr/local by default). The legacy env had a KDChart 2.6.0 Qt5 RPM;
|
||||
# the Qt6 build needs a Qt6-compatible release (e.g. github.com/KDAB/KDChart
|
||||
# tag kdchart-3.0.0 with -DKDChart_QT6=true). OreOnlineReportsGuiPlugin's
|
||||
# CMake RETURN()s when KDChart is absent, so without it the plugin (iid
|
||||
# ore.onlinereports) stays unbuilt - environmental floor.
|
||||
resolve_kdchart() {
|
||||
KDCHART_PRESENT=OFF
|
||||
if [[ -f /usr/local/include/KDChart/kdchart_export.h ]]; then
|
||||
KDCHART_PRESENT=ON
|
||||
log_info "KDChart present at /usr/local - OreOnlineReportsGuiPlugin will be built"
|
||||
else
|
||||
log_warn "KDChart not present at /usr/local - OreOnlineReportsGuiPlugin stays unbuilt (legacy KDChart 2.6.0 was a Qt5 RPM; build a Qt6-compatible release from source to close this floor)"
|
||||
fi
|
||||
}
|
||||
|
||||
resolve_schusstafel
|
||||
resolve_kdchart
|
||||
|
||||
cd ${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus
|
||||
|
||||
# Clean build directory (running as root inside container)
|
||||
@@ -1615,6 +1862,15 @@ cmake .. \
|
||||
-DBUILD_GRANTLEE="${BUILD_GRANTLEE}" \
|
||||
-DBUILD_ARCGIS="${BUILD_ARCGIS}" \
|
||||
-DBUILD_CODIFICATION="${BUILD_CODIFICATION}" \
|
||||
-DBUILD_FILTERMANAGEMENT="${BUILD_FILTERMANAGEMENT}" \
|
||||
-DBUILD_WLS="${BUILD_WLS}" \
|
||||
-DBUILD_PLUGINS_SERVICEMONITOR="${BUILD_PLUGINS_SERVICEMONITOR}" \
|
||||
-DBUILD_PLUGINS_PLANEDITOR="${BUILD_WEBENGINE_PLUGINS}" \
|
||||
-DBUILD_PLUGINS_ONLINEHELP="${BUILD_WEBENGINE_PLUGINS}" \
|
||||
-DBUILD_PLUGINS_PARTICIPANT_ORG_CHART="${BUILD_WEBENGINE_PLUGINS}" \
|
||||
-DBUILD_PLUGINS_MSDL="${BUILD_XMLPATTERNS_EFFECTIVE}" \
|
||||
-DBUILD_PLUGINS_SAAB="${BUILD_XMLPATTERNS_EFFECTIVE}" \
|
||||
-DWITH_SCHUSSTAFEL="${WITH_SCHUSSTAFEL_EFFECTIVE}" \
|
||||
${CMAKE_BUILD_FLAGS:-} \
|
||||
-DCMAKE_CXX_DEPENDENCIES_USE_COMPILER=OFF \
|
||||
-DCMAKE_CXX_STANDARD=17 \
|
||||
@@ -1635,6 +1891,30 @@ read -r -a GROUP10_ARRAY <<< "${GROUP10_TARGETS}"
|
||||
read -r -a GROUP11_ARRAY <<< "${GROUP11_TARGETS}"
|
||||
read -r -a GROUP12_ARRAY <<< "${GROUP12_TARGETS}"
|
||||
|
||||
# cesPluginGeoPairing #includes Schusstafel.h unconditionally - drop it from
|
||||
# Group 12 when the Schusstafel package is unavailable (environmental floor).
|
||||
if [[ "${WITH_SCHUSSTAFEL_EFFECTIVE}" != "ON" ]]; then
|
||||
_GROUP12_ARRAY=()
|
||||
for _t in "${GROUP12_ARRAY[@]}"; do
|
||||
if [[ "${_t}" != "cesPluginGeoPairing" ]]; then
|
||||
_GROUP12_ARRAY+=("${_t}")
|
||||
fi
|
||||
done
|
||||
GROUP12_ARRAY=("${_GROUP12_ARRAY[@]}")
|
||||
fi
|
||||
|
||||
# OreOnlineReportsGuiPlugin RETURN()s at configure when KDChart is absent -
|
||||
# drop it from Group 12 in that case (environmental floor, see resolve_kdchart).
|
||||
if [[ "${KDCHART_PRESENT}" != "ON" ]]; then
|
||||
_GROUP12_ARRAY=()
|
||||
for _t in "${GROUP12_ARRAY[@]}"; do
|
||||
if [[ "${_t}" != "OreOnlineReportsGuiPlugin" ]]; then
|
||||
_GROUP12_ARRAY+=("${_t}")
|
||||
fi
|
||||
done
|
||||
GROUP12_ARRAY=("${_GROUP12_ARRAY[@]}")
|
||||
fi
|
||||
|
||||
if [[ "${TESTS_ONLY}" != "ON" ]]; then
|
||||
if [[ "${BUILD_VIEWER_ONLY}" == "ON" ]]; then
|
||||
log_info "BUILD_VIEWER_ONLY enabled - skipping Groups 1-4, building only Viewer module targets"
|
||||
@@ -1687,6 +1967,11 @@ docker run --rm \
|
||||
-e BUILD_GRANTLEE \
|
||||
-e BUILD_ARCGIS \
|
||||
-e BUILD_CODIFICATION \
|
||||
-e BUILD_FILTERMANAGEMENT \
|
||||
-e BUILD_WLS \
|
||||
-e BUILD_PLUGINS_SERVICEMONITOR \
|
||||
-e BUILD_WEBENGINE_PLUGINS \
|
||||
-e BUILD_XMLPATTERNS_PLUGINS \
|
||||
-e BUILD_GROUP1 \
|
||||
-e BUILD_GROUP2 \
|
||||
-e BUILD_GROUP3 \
|
||||
|
||||
Reference in new issue
Block a user