 torsten
|
0997dcba79
|
Fixes merge conflicts, but leaves out-of-DDS-scope build errors (tbc)
|
2026-09-21 17:04:53 +00:00 |
|
 torstenandCopilot
|
ab29b7b2d5
|
Merge origin/feature/migrate-and-test-DDS-targets into feature/qt6-migration-basis-modules
Resolve merge conflicts between Qt6 migration basis modules and DDS test/target migration:
- codegen_simple.py: Keep Qt6 includes (generic_dtc_impl.h, service header)
- svc_ftc_impl.cpp.grantlee: Adopt DDS branch conditional logic ({% if ft.isCoreFt %})
- generic_dtc.h/.impl.h (include/ and Lts/): Keep Qt6 full-path includes, explicit wrapper methods for consistency
- connext.h: Add logger initialization for Requester/Replier (DDS branch enhancement)
- new_docker_build.sh:
- Add GROUP4_TARGETS for DDS tests
- Smart DOCKER_IMAGE selection (prebuilt vs ubuntu:26.04)
- Add BUILD_TESTING=ON to cmake
- Add Group 4 (DDS Tests) build step
Strategy: Preserve Qt6 migration decisions while incorporating DDS test/target changes.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
2026-09-21 14:07:42 +00:00 |
|
|
torsten
|
7cd3e43959
|
Adds ktexttemplate as apt package to new_docker_build.sh and builds successfully
|
2026-09-21 15:43:39 +02:00 |
|
|
torsten
|
a1914cb7d9
|
Adds succesfull lts/proxies migration & testsuite
|
2026-09-19 09:18:18 +00:00 |
|
|
torsten
|
eb02c1f001
|
Removes code-generated files that were accidentally committed to the repo
|
2026-09-14 11:21:00 +00:00 |
|
|
torsten
|
f217207675
|
Unifies forward-declations forlder into single point of truth
|
2026-09-14 09:27:30 +00:00 |
|
|
torsten
|
290d9c1f5d
|
Moves remaining few files to common subfolders
|
2026-09-14 08:49:36 +00:00 |
|
|
torsten
|
758ae0f53f
|
Migration of Legatus codebase to Qt6 with RTI Connext DDS 7.7 integration is partially complete. Core DDS targets build successfully, but ProjectDataManagement module blocks full ddsfts compilation due to IDL definition conflicts.
|
2026-09-07 19:18:30 +02:00 |
|
|
torsten
|
b656e1aaa9
|
Resolves latest issues in Lts/Common Lts/DDS
|
2026-09-06 18:45:59 +02:00 |
|
|
torsten
|
851d47e114
|
BUILD_RTI=OFF: 1902/1902 Targets erfolgreich, DDS-Stubs vervollständigt
Neue Stub-Header für BUILD_RTI=OFF Konfiguration:
- include/DDS/Generic/generic_base.h: Topic-Name-Templates, Helper-Funktionen
- include/DDS/Generic/generic_logger.h: Logger-Wrapper mit DataType-Enum
- include/DDS/Generic/ddsgen_export.h: Export-Makros (leer für OFF)
- include/DDS/Generic/generic_data_reader.h: Data Reader Template-Stub
- include/DDS/DTC/generic_dtc.h: Minimale DDS-Typen für DTC
- include/LtsUtils/LtsUtilsCore/data_modification_enum.h: DataModification Enum
- include/FileManagement/flm_dtc_impl.h: Virtuelle Methoden für Name-Helper
- include/OperatorManagement/opm_dtc_impl.h: DtcImpl ohne Q_OBJECT
Wichtige Änderungen:
- QObject-Basisklasse entfernt für DatabaseInterfaceImpl und DtcImpl (BUILD_RTI=OFF)
- Logger-Stub verwendet Qt-Logging (qDebug/qWarning/qCritical)
- FileStatus als int-Alias statt enum class für BUILD_RTI=OFF
- CMake: DDS-Bibliotheken als leere INTERFACE-Targets für BUILD_RTI=OFF
- std::optional: is_set() → has_value(), get() → value()
- QList → std::vector Konversionen korrigiert
- qAsConst-Fehler mit rvalue expressions behoben
Build-Status: 1902/1902 Targets erfolgreich (BUILD_RTI=OFF)
Tests: Nicht ausführbar ohne RTI Connext DDS (BUILD_RTI=ON erforderlich)
|
2026-08-30 10:36:47 +02:00 |
|