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>
This commit is contained in:
torstenandCopilot committed 2026-09-21 14:07:42 +00:00
commit ab29b7b2d5
34 files changed
+617 -200

No files matched your search

@@ -116,9 +116,17 @@ static T buildErrorReason(int reason, int requestId)
}
T reply;
{% if ft.isCoreFt %}
reply.setId(requestId);
reply.setStr(errString.c_str());
for (const auto& arg : errArgs)
reply.arg(arg);
{% else %}
reply.id = requestId;
reply.errorString = errString;
reply.errorParams = errArgs;
reply.errorString = errString.c_str();
for (const auto& arg : errArgs)
reply.errorParams.push_back(arg);
{% endif %}
return reply;
}
@@ -195,9 +203,12 @@ int64_t FtcImpl::{{ ft.requestFlc }}(const {{ ft.requestType }} &request, const
{% if ft.isCoreFt %}
const auto _reply = future.get(); // throws if exception set
Core::FunctionReplyObject fro(
{% for rp in ft.replyParams %} _reply.{{ rp.nameGetter }}(){% if not forloop.last %},{% endif %} {% endfor %}
);
Core::FunctionReplyObject fro;
fro.setId(_reply.id);
fro.setStr(_reply.errorString.c_str());
for (const auto& arg : _reply.errorParams)
fro.arg(arg);
fro.setAdditionalInfo(_reply.additionalInfo.c_str());
fro.setUniqueId(m_last{{ ft.request }}UniqueId);
if (fro.error())
@@ -232,10 +243,12 @@ void FtcImpl::{{ ft.onReply }}(const {{ namespace }}::{{ ft.reply }} &reply, int
m_last{{ ft.request }}UniqueId = uniqueId + {{ ft.replyHandlerHash }};
{% if ft.isCoreFt %}
Core::FunctionReplyObject fro(
{% for rp in ft.replyParams %}
reply.{{ rp.nameGetter }}(){% if not forloop.last %},{% endif %} {% endfor %}
);
Core::FunctionReplyObject fro;
fro.setId(reply.id);
fro.setStr(reply.errorString.c_str());
for (const auto& arg : reply.errorParams)
fro.arg(arg);
fro.setAdditionalInfo(reply.additionalInfo.c_str());
fro.setUniqueId(m_last{{ ft.request }}UniqueId);
cb(fro);
{% else %}