torstenandCopilot
7173785915
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
65 lines
2.1 KiB
C++
65 lines
2.1 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* Generate cpp structs from xml
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
#include "DatabaseGeneratorGrantlee.h"
|
|
#include "StructBuilder.h"
|
|
#include <NGLLogger/INGLLogger.h>
|
|
#include <grantlee/context.h>
|
|
|
|
using namespace CodeGen;
|
|
|
|
DatabaseGeneratorGrantlee::DatabaseGeneratorGrantlee(bool targetIsServer)
|
|
: GeneratorGrantleeBase("CodeGen.CppStructGeneratorGrantlee")
|
|
, m_targetIsServer(targetIsServer)
|
|
{}
|
|
|
|
bool DatabaseGeneratorGrantlee::init(const XmlReader *reader,
|
|
StructBuilder *structBuilder)
|
|
{
|
|
if (!GeneratorGrantleeBase::initInternal(reader, structBuilder))
|
|
return false;
|
|
|
|
// Is Service exercise-independent?
|
|
if (reader->isServiceExerciseIndependent())
|
|
m_ctx->insert(QStringLiteral("isExerciseIndependent"), QLatin1String("1"));
|
|
|
|
bool bHasDbNotifications = false;
|
|
QVector<DbStructWrapper *> vlServiceStructs;
|
|
QVector<DbStructWrapper *> vlStaticDataStructs;
|
|
const QVector<CompleteStructInformation> csiData = structBuilder->structInformations();
|
|
vlServiceStructs.reserve(csiData.size());
|
|
vlStaticDataStructs.reserve(csiData.size());
|
|
for (const CompleteStructInformation &csi : csiData)
|
|
{
|
|
DbStructWrapper *dbStructWrapper(new DbStructWrapper(csi, this));
|
|
|
|
if (csi.hasStaticContent)
|
|
vlStaticDataStructs += dbStructWrapper;
|
|
else
|
|
vlServiceStructs += dbStructWrapper;
|
|
if (!csi.dbNotifications.isEmpty())
|
|
bHasDbNotifications = true;
|
|
}
|
|
addCustomFunctions(reader->getCustomFunctions());
|
|
|
|
if (structBuilder->needPoint3d())
|
|
m_ctx->insert(QStringLiteral("need_point3d"), QLatin1String("1"));
|
|
if (structBuilder->needPgArrayInclude())
|
|
m_ctx->insert(QStringLiteral("need_pgarray"), QLatin1String("1"));
|
|
m_ctx->insert(QStringLiteral("cpp_structs"), QVariant::fromValue(vlServiceStructs));
|
|
m_ctx->insert(QStringLiteral("data_structs"), QVariant::fromValue(vlStaticDataStructs));
|
|
if (bHasDbNotifications)
|
|
m_ctx->insert(QStringLiteral("has_db_notifications"), QLatin1String("1"));
|
|
|
|
m_ctx->insert(QStringLiteral("library_target"), m_targetIsServer ? QStringLiteral("SERVER") : QStringLiteral("COMMON"));
|
|
|
|
exportUsedServices(reader);
|
|
|
|
return true;
|
|
}
|