Follow-up to the FileManagement cleanup: an audit of every
include_directories() in the tree resolved each path against the source
and a fully-built build dir. The pruned Lts/Viewer (SituationMap,
LtsDataView, Symbology), the LtsUtilsGui/ConnectDialog codegen dir, the
pruned Messaging/OperatorManagement services, and the plugin-level
AudioVideoManagement/GuezNasat/TopicEditorBase/OperatorManagement/LtsDataView
entries all pointed at paths that do not exist, so each one only emitted
-Wmissing-include-dirs warnings. A missing -I dir cannot provide any
header, so the removals are functionally neutral. The audit now reports
zero missing include dirs.
The root CMakeLists still listed include dirs for services removed during
the Release 2 prune (FileManagement, InfrastructureManagement, AssetManagement,
AudioVideoManagement, ExerciseEvent/Management, NotificationManagement,
ParticipantManagement, ReportManagement, SituationReplay, Evaluations) and for
the pruned GuezNasat proxy. None of the referenced source or build paths
exist anymore, so every entry only produced
"cc1plus: warning: ... No such file or directory [-Wmissing-include-dirs]"
on every translation unit. A missing -I dir cannot provide any header, so the
removal is functionally neutral.
NGL_ADD_SUBDIR_GUARDED(translations) after Lts (same position as
story/release-validation-scope): translations/CMakeLists.txt reads the
global NGL_TS_TARGETS property accumulated by the NGL macros, so it must
be added last to see every target.
BUILD_TS_FILES is OFF by default (cmake/NGLMacros.cmake), so normal
builds are unaffected; with -DBUILD_TS_FILES=ON the dir generates the
lupdate .pri files and the update_ts_{en_US,en_GB,de_DE} custom targets.
This commit also carries a comment-only cleanup of the file that was
already in the working tree (explanatory comment blocks removed; no
functional line changed - the RPATH $ORIGIN entries, the test
relocation block and the guarded subdirs are all intact). The removed
comments are recoverable from the previous revision if wanted.
Verified with a throwaway BUILD_TS_FILES=ON configure: 0 errors, all
three update_ts_* targets registered, 63 lupdate .pri files generated.
The TDS_INSTALL_TRANSLATION (.qm) calls stay commented as in the source.
Test binaries (naming: test_* | *_test | *_smoke | *Tests - 26 targets
incl. the ctest-registered ones and pdmTests) now build into
<build>/bin/unit-test/ instead of <build>/bin/.
- CMakeLists: post-processing pass after all add_subdirectory calls sets
RUNTIME_OUTPUT_DIRECTORY (overrides the legacy EXECUTABLE_OUTPUT_PATH)
plus a 5-level $ORIGIN BUILD_RPATH entry (from bin/unit-test the RTI
libs are one level further away than from bin/). Targets are collected
by walking the SUBDIRECTORIES tree - the global TARGETS property is
empty under CMake 4.x, which silently broke the first attempt.
- add_test() uses $<TARGET_FILE:...>, so the ctest registry follows the
new location without changes.
- rpmbuild/make_rpm_ubuntu26*.py: test discovery points at
build/bin/unit-test; the release2 runtime DEB mirrors the layout into
usr/bin/unit-test/ so the test binaries stay in the package.
- README: bin/unit-test/ documented in the output list and snippets.
Verified (fresh /workspace-mount build): all 26 test executables in
bin/unit-test/, ctest 20/22 (same 2 pre-existing out-of-scope failures),
RUNPATH carries the 5-level $ORIGIN RTI entry and ddscore_unit_test runs
from bin/unit-test with no LD_LIBRARY_PATH / RTI_LICENSE; app binaries in
bin/ keep their 4-level entry.
The build directory is now a fixed 'build' next to the tree
(qt6-after/build), not in-tree build4 / build4_<timestamp>_<pid> dirs.
- CMakeLists: the $ORIGIN RTI RUNPATH entry is now 4 levels up from a
bin/ or lib/ artifact (the build tree is one level shallower)
- new_docker_build_release2.sh: BUILD_DIR is the fixed ../build; the DEB
tar drops the ./build4* exclude (the build dir is outside the tree)
- new_docker_build.sh: Docker mounts the tree's parent so ../build lands
next to the tree on the host; in-container paths (cmake source,
SRCROOT, deb_stage, rpms, staging tar) updated accordingly
- rpmbuild/make_rpm_ubuntu26*.py: stale build4/ references now say build/
- README: build4 -> ../build in every snippet and doc line
Verified: fresh full-scope configure + ninja all in qt6-after/build is
green; ctest 20/22 (same 2 pre-existing out-of-scope failures as the
previous baseline); RUNPATH carries the 4-level $ORIGIN entry and
ddscore_unit_test runs with no LD_LIBRARY_PATH / RTI_LICENSE.
The RTI Connext libraries live outside the tree (pipeline-root
external/rti_connext_dds-7.7.0). CMake bakes their absolute path into
the RUNPATH, which only resolves on the build host's mount - running
the built binaries under another mount (e.g. /workspace) failed with
'libnddsc.so: cannot open shared object file'.
Add a $ORIGIN-relative RUNPATH entry (5 levels up from any bin/ or
lib/ artifact is the pipeline root) so the RTI libraries resolve
regardless of the mount point. No LD_LIBRARY_PATH needed anymore.
Verified: ddscore_unit_test runs with no env vars set.
Bring the validation-scope line (in-tree Jenkins CI copy, lcov coverage
wiring, step-by-step release-scope README, TetraIF unit tests, the
LogView runtime icon/resource fix, Dockerfile, rpmbuild and the
new_docker_build.sh driver with the DEB output path) on top of the
XmlPatterns branch pruned to the Release 2 scope.
Conflict policy:
- Out-of-scope targets/modules: keep the prune (deletion wins).
- In-scope files that validation had deleted: restored from
story/release-2-cleanup (the Release 2 closure, with the
pruned-module guards).
- In-scope sources carrying migration work: XmlPatterns versions
(Qt XmlPatterns rework on QDomDocument, DDS member and logger
fixes, first-build fixes).
- Scope-aware CMakeLists (top level, PluginInterfaces, LtsWidgets)
and .envrc: story/release-2-cleanup / ours versions.
Audited the release-scope compilation (TetraIF, Z/src, Lts/Common +
TrainingAreaBase, BUILD_RTI=OFF) for every file under include/:
Removed (zero references from release-scope sources or CMake):
- service-stub header dirs (AlarmManagement, AreaEffectSimulation,
AssetManagement, AudioVideoManagement, Core, ExerciseEventManagement,
ExerciseManagement, GuezNasat, InfrastructureManagement, Lts,
LtsProjectionWorkstation, LtsScriptTimeline, LtsSession,
MarkerManagement, NotificationManagement, OperatorManagement,
ParticipantManagement, ProjectDataManagement, ReportManagement,
Services, SituationReplay, TopicEditorBase, Viewer)
- include/grantlee (codegen modules excluded from the release build)
- include/nglapplication (all headers duplicate Z/src/nglapplication)
- include/poppler (Qt5 header; the build includes poppler/qt6 from the
system package)
- include/rti (142 Connext DDS headers; only consumers are behind
BUILD_RTI, which is OFF for this branch)
- TetraIF/LogView zsksxd_tetraForLogView{,_guez}.cpp and
zsksxd_tetraForLogView_guez.x (the build compiles the .x; the guez
variant is referenced nowhere; LogView loads the .x from the app dir)
Kept (actively included): include/GeographicLib, include/LtsUtilsGuiDds,
include/NGLLogger.
Also drop the now-dangling include_directories for the removed dirs in
the top-level CMakeLists (include/Viewer/SituationMap) and
Lts/CMakeLists.txt (six stub dirs) - otherwise GCC warns
-Wmissing-include-dirs for every compile.
Verified with a full pipeline rebuild (scope-rebuild15): 0 warnings,
ctest baseline unchanged, all 5 DEBs produced.
- Guard the Lts/Viewer include paths with if(EXISTS): the module is
outside the release scope, and the unguarded include_directories
emitted -Wmissing-include-dirs for every translation unit
- nglpdfpage: initialize m_rotation before m_scaleFactor to match the
member declaration order (-Wreorder)
- TrainingAreaBase's tab_plugin_interface.h includes <ProjectDataManagement/pdm.hpp>
- For release builds (RELEASE_BUILD=ON), add stubs directory to include path
- Stub headers provide type definitions without DDS dependencies
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
- Wrap include_directories for Services, DDS, Plugins, and Proxies/GuezNasat
in IF(NOT RELEASE_BUILD) block to prevent CMake errors when these
directories don't exist in release scope builds
- Keep include paths for release-scope modules (Lts/Common, LtsUtils,
LtsUtilsCore, LtsUtilsSettings, NGLLogger, Viewer/SituationMap) outside
the conditional so they're always available
- This prevents CMake from trying to add non-existent directories when
building with RELEASE_BUILD=ON
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
- Main CMakeLists.txt line 783 includes MacroCodeGenIdl.cmake unconditionally
- This causes ngl_codegen target reference even when CodeGen module is excluded
- Wrap INCLUDE(MacroCodeGenIdl) in IF(NOT RELEASE_BUILD) to skip for release builds
- Prevents 'make: *** No rule to make target ngl_codegen' error in release scope builds
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
- Added RELEASE_BUILD check to imported ngl_codegen target creation
- Prevents make errors when CodeGen is excluded from release builds
- Release scope modules don't use CODEGEN macros, so target is not needed
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
- Changed include_directories from ${CMAKE_SOURCE_DIR}/Lts to ${CMAKE_SOURCE_DIR}
- This allows #include <Lts/Common/ProjectConfig/project_defines.h> to resolve correctly
- Required for LtsSession and other modules using ProjectConfig headers
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
- Add RELEASE_BUILD CMake option to control release scope
- Modify main CMakeLists.txt to conditionally build only release modules
- Modify Lts/CMakeLists.txt to only include Lts/Common when RELEASE_BUILD=ON
- Modify Lts/Common/CMakeLists.txt to exclude LtsElevation (depends on Lts/Viewer/SituationMap)
- Update new_docker_build.sh defaults for release:
- RELEASE_BUILD=ON (default)
- BUILD_RTI=OFF (avoids Lts/Services/GROUP1 dependency)
- BUILD_GROUP3=ON (TetraIF), BUILD_GROUP5=ON (Z), BUILD_GROUP11=ON (Lts/Common)
- All other BUILD_GROUP* variables OFF
- Add RELEASE_BUILD to Docker environment exports and CMake invocation
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Continue the Qt5->Qt6 migration so the LTS Projects (Group 10) and LTS
Application (Group 11) compile, link, and ctest runs.
Qt5->Qt6 API migration (resolves removed/deprecated Qt6 APIs) across Lts
Tools and Apps, e.g. QAction->QActionGroup, QAbstractSocket::errorOccurred,
Qt::SkipEmptyParts, QRandomGenerator, QInputDevice::DeviceType,
QRegularExpression, QLatin1Literal->QStringLiteral, and the SampleModel
m_description->description rename.
CMake build fixes:
- CMakeLists.txt: add Lts/Common to CMAKE_AUTOMOC_INCLUDE_DIRECTORIES so moc
resolves Q_INTERFACES(ProjectPlugin::Plugin) for the migrated Projects.
- cmake/NGLMacros.cmake: NGL_COMPILE_RESOURCES - replace return() (which aborts
the calling CMakeLists.txt) with an if/else/endif.
- OpApp/THP: guard the ArcGISQt5Hack link with $<IF:$<TARGET_EXISTS:...>> (the
target is absent when the SituationMap viewer is stubbed); matches
CentralEffectSimulation.
- LtsSession: prefer the in-tree svcCoreClient target over a FIND_LIBRARY in
/usr/local/lib.
- CnrProxyTester/DotMatrixDisplay: set AUTOUIC_SEARCH_PATHS for the ui/ subdir.
- TopicDiscover: link NGLLogger.
Export-header visibility stubs (expand the empty *_EXPORT macro to
__attribute__((visibility("default"))); the build sets -fvisibility=hidden and
these stubs shadow the CMake-generated header):
- include/LtsProjectionWorkstation/ltsprojectionworkstation_export.h (fixes
undefined reference to LtsProjectionWorkstation::getInstance /
setProjectionOperatorPreset)
- include/LtsSession/ltssession_export.h, include/LtsUtilsGuiDds/ltsutilsguidds_export.h (same pattern)
New plugin modules (copied from legacy) so LtsAppDescriptorChecker finds the
gui:3 IIDs referenced by the Projects' apps.json:
- TakeHomePackageManager/OldTHP gui:3:tpm.man, gui:3:tpm.usb
- PresentationManagement/.../ScriptEditor gui:3:pre.script.edit
- Timeline/Gui/EventTimelineClassic gui:3:tln.view
new_docker_build.sh: correct group targets to the actual CMake target names,
guard LtsReportDisplay on BUILD_CODIFICATION, and skip modules unavailable in
the prebuilt image (AsmWorkstationCertifier/botan2, TrajectoryWidget,
VideoImport, thp_viewer/VLC).
Deletes the two stub-header trees (249 files) that shadowed the real
rtiddsgen-generated DDS headers, and removes every reference to them.
CMake (15 include-path entries):
root CMakeLists.txt include_directories(.../forward-declarations);
NGL_TARGET_INCLUDE_DIRECTORIES entries in 7 service CMakeLists
(ServiceManagement, SoundManagement, SituationMap, ScreenRecording,
SituationReplayManagement, SituationReplay, ServiceMonitor)
Source includes that resolved to the root-level stubs (only 2, repointed to the
module-prefixed generated headers the rest of the tree already uses):
Lts/Services/AreaEffectSimulation/object_charge_effect.h
<aes_dtc.h> -> <AreaEffectSimulation/aes_dtc.h>
Lts/Proxies/TrainingAreaBaseOC/websocket_handler.h
<taboc_dtc.h> -> <TrainingAreaBaseOC/taboc_dtc.h>
(generic_dtc_impl.h needs no change: its quote-include "generic_dtc.h"
resolves to the real Lts/DDS/DTC/generic_dtc.h in the same directory)
Tests:
tests/test_migration_stubs.cpp: remove the redundant root-level stub test
(AesDtcCompiles) - the module-prefixed AreaEffectSimulationDtcCompiles test
already exercises the same AreaEffectSimulation::Interface header.
tests/test_skl_dtc.cpp: delete (removed-module compile test, already filtered
out of the build) and remove its now-obsolete CMake list(FILTER) exclusion.
Validation: full rebuild (build4, make -j4 -k) with the removal - 0 new compile
errors vs the pre-existing base-state baseline (77 unique real-error signatures
identical to baseline; all 15 'No such file' headers pre-existing).
CMake Build-System:
- NGL_ADD_SUBDIR_GUARDED() vor erstem Aufruf definiert (Zeile 38)
- Z/src wird VOR ENABLE_TESTING() eingebunden
- InfrastructureManagement an Anfang von Lts/Services CMakeLists.txt
- ALIAS Targets für RTI nur für existierende Libraries erstellt
RTI 7.7 Integration:
- generic_base.h: QMetaMethod Include hinzugefügt
- generic_data_reader.h: Template-Signatur auf 2 Parameter angepasst
- detail::DataReaderImpl<Q> als Default-Template-Parameter
Qt6 Location Support:
- Dockerfile: qtlocation und qtpositioning Module hinzugefügt
Dokumentation:
- C++23 Inkompatibilität mit RTI 7.7 in copilot-instructions.md
- EXTERNAL_DEPENDENCIES.md Strategie dokumentiert
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
- CMakeLists.txt: ALIAS Targets nur für existierende RTI-Libraries (Zeilen 254-285)
- Keine INTERFACE-Placeholder für ddsftc/ddsfts/ddsconnector (Module definieren eigene Targets)
- flm_enums.hpp: QDebug operator<< für FileStatus enum class implementiert
BUILD_RTI=ON: Configure erfolgreich nach Target-Fix