- Lts/CMakeLists.txt: restore the cleanup scope (Tools, DDS, Common,
Services, Proxies, Plugins) - the validation version configured only
Lts/Common and TrainingAreaBase, silently dropping the GROUP1 DDS
targets, the GROUP5 tools and the service libraries.
- 11 further scope CMakeLists from cleanup: the validation versions had
removed the per-module unit-test subdirectories (ctest baseline
targets), LtsUtilsGui, and used a stale GeographicLib link style.
- PrtCnv: keep the validation CMAKE_CURRENT_BINARY_DIR include
(generated prtcnvlib_export.h).
- sPDM executable: guard on Lts/Common/LtsWebSocket (pruned, link
orphan) like the sTAB executable.
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.
Delete everything that is not part of the Release 2 build closure
defined by the story/release-2-cleanup README (46 targets,
GROUP1/3/5/6): out-of-scope Lts modules (Viewer, OSG/BuildingViewer
floor, Schusstafel, MSDL/SAAB import tools, ...), the include/ stub
surplus, tests/, specs/, translations/, the migration report files,
cmake/FindOpenSceneGraph.cmake, external/Schusstafel and the legacy
new_docker_build.sh driver.
In-scope files keep the XmlPatterns-branch versions (Qt XmlPatterns
rework on QDomDocument, BZip2 nglcompression, first-build fixes).
Tracked file count: 16140 -> 2166.
- Drop the 'Stub file ... BUILD_RTI=OFF / Auto-generated' headers from the
tab_* and pdm_* stub files (RTI is gone on this branch; the names say it)
- Drop stub comments from MockCoordTrans.h and the coordTransTests placeholders
- Drop the DDS exclusion list comment from Lts/Common/CMakeLists.txt
- Shorten the staging and packages-out comments in new_docker_build.sh
The RELEASE_BUILD include path (root CMakeLists.txt) points to
Lts/Services/ProjectDataManagement/stubs, which TrainingAreaBase's
tab_plugin_interface.h needs (ProjectDataManagement/pdm.hpp). Only the
stub headers are restored - the full PDM module stays out of scope.
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).
- Updated all include/*/*_dtc.h stub headers to include generated files
from build4/Lts/Proxies/*/ directories
- Changed ParticipantManagement stub headers to use generated files
- Updated ProjectDataManagement pdm_enums.hpp to include generated file
- Updated Buildings bld_dtc.h to include generated file
- Created BUILD_STATUS_REPORT.md documenting current build state
Migration Status:
- DDS core libraries: ✅ Building successfully (6 libraries)
- Proxies module code: ✅ Migration complete
- Services modules: ⚠️ Pre-existing errors blocking full build
- ParticipantManagement: Type definition mismatches
- InfrastructureManagement: Struct/member mismatches
- ProjectDataManagement: DTC implementation errors
These Services errors are unrelated to Qt6 migration work and require
separate fixes. Once resolved, Proxies module will build automatically.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>