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>
40 lines
1.2 KiB
Plaintext
40 lines
1.2 KiB
Plaintext
/**
|
|
* @RDE_HEADER@
|
|
* Template for idl struct definitions
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Hanna E. Rathje, SLSE, 2015-08-05
|
|
*/
|
|
|
|
{% autoescape off %}
|
|
// filename: {{ namespace_abbr }}.idl
|
|
#ifndef {{ namespace_abbr }}_idl_included
|
|
#define {{ namespace_abbr }}_idl_included
|
|
|
|
//@copy #include <{{ include_prefix }}/{{ namespace_abbr }}_export.h> // #define NDDSUSERDllExport for linux
|
|
|
|
//@copy #include "{{ namespace_abbr }}_enums.hpp"
|
|
#include "{{ namespace_abbr }}_enums.idl"
|
|
|
|
{% for ext_service in ext_services.member %}
|
|
//@copy #include <{{ ext_service.baseFilePath }}.hpp>
|
|
#include <{{ ext_service.baseFilePath }}.idl>
|
|
{% endfor %}
|
|
|
|
module {{ namespace }}
|
|
{
|
|
{% for idl_struct in idl_structs %}
|
|
|
|
{% if idl_struct.comment %} // {{ idl_struct.comment }} {% endif %}
|
|
struct {{ idl_struct.name }} {% if idl_struct.baseValueType %}: {{ idl_struct.baseValueType }} {% endif %}
|
|
{ {% for idl_member in idl_struct.member %}
|
|
{{ idl_member.type }} {{ idl_member.name }}; {{ idl_member.isKey }} {{ idl_member.isOptional }} {% endfor %}
|
|
}; //@Extensibility {{ idl_struct.extensibility }}
|
|
|
|
{% endfor %}
|
|
}; // namespace {{ namespace }}
|
|
|
|
#endif
|
|
{% endautoescape %}
|