- 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.
The merge from story/release-validation-scope only carried files that
existed at the common base or on that branch. In-scope files added on
story/release-2-cleanup after the base (per-module unit-test dirs, the
Release 2 driver and rpmbuild script) were missing, breaking
ADD_SUBDIRECTORY(unit-test) references.
- Restore the 33 missing in-scope files from story/release-2-cleanup.
- Lts/Common/CMakeLists.txt and LtsUtilsGui/CMakeLists.txt: take the
story/release-2-cleanup versions (the validation versions still
reference out-of-scope subdirectories: httq, LtsRestClient,
LtsWebSocket, ConnectDialog, StyleManager).
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.
- LtsUtilsGui/ConnectDialog links against LtsWidgets which is not in release scope
- Wrap LtsUtilsGui subdirectory in IF(NOT RELEASE_BUILD) conditional
- Only LtsUtilsCore and LtsUtilsSettings are included in release builds
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
- LtsUtilsGuiDds requires DDS headers not available in release scope
- Only needed by LtsMultiMonitor which is outside release scope
- Wrap ADD_SUBDIRECTORY in RELEASE_BUILD check
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
- dynamic_data_reader.h: Add #include <rti/core/xtypes/DynamicDataImpl.hpp>
to resolve incomplete type error when deleting DynamicDataImpl pointers
- generic_dts_impl.h: Add m_logger member variable declaration (LOGGER_T&)
- dynamic_data_reader.h: Add m_logger member variable declaration (LOGGER_T&)
- pub_sub_base.cpp: Fix logger initialization to use
NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger() instead of
non-existent NGL::getNGLLogger()
- lts_session_data_dds.h: Add DataPluginBase::Interface forward declaration
to both #ifdef BUILD_RTI and #else blocks for consistent compilation
- LtsUtilsCore/CMakeLists.txt: Fix include path from /.. to /../..
for LtsUtilsCoreHeaderOnly target
- tests/CMakeLists.txt: Move Grantlee test filtering BEFORE executable
creation to prevent build failures when Grantlee is disabled
Build validation:
- BUILD_RTI=OFF: ✅ 0 errors (previously completed)
- BUILD_RTI=ON: ✅ DDS core components compile successfully
- libddsconnector.so created successfully
- Remaining build errors in unrelated modules (IsmDataPluginInterface,
IsmShared, BuildingControlBsm) are pre-existing dependency issues
C++ Standard: Enforcing C++17 across all builds due to RTI Connext DDS 7.7.0
incompatibility with C++20/C++23 (known header bugs with newer standards).
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
- cmake/FindRTI.cmake: Add INTERFACE placeholder targets when RTI not found
- cmake/FindRTI.cmake: Force BUILD_RTI=OFF when RTI not installed
- Lts/Common/LtsSession/CMakeLists.txt: Make LtsSessionDataDds conditional on BUILD_RTI
- Lts/Viewer/CMakeLists.txt: Make LtsDataView conditional on BUILD_RTI
- Lts/Plugins/*/CMakeLists.txt: 97 plugin files wrapped in BUILD_RTI conditionals
- cmake/NGLMacros.cmake: Fix NGL_ADD_BIG_RESOURCES macro (removed premature return())
- Multiple Qt6 API fixes: QLinkedList→std::list, QStringRef→QStringView, etc.
- BUILD_RTI_FIXES_SUMMARY.md: Comprehensive documentation of all fixes
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>