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>
54 lines
2.6 KiB
XML
54 lines
2.6 KiB
XML
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
|
<service namespace="OcSituationServer" abbreviation="OSS" procNames="OcSituationServer" exerciseDependency="Exercise" groups="ExerciseExecution,ExercisePaused" prio="">
|
|
<rcs>
|
|
<Id Id="$Id: ea_export_script.txt 41311 2018-04-23 09:43:45Z ehrlicher $"/>
|
|
<HeadURL HeadURL="$HeadURL: svn://slssvn/TDS/branches/product/devel/trunk/Lts/Common/CodeGen/ea_export_script.txt $"/>
|
|
<Author Author="$Author: ehrlicher $"/>
|
|
</rcs>
|
|
<tables>
|
|
<table name="oss_reset_counter">
|
|
<column name="aes_type_id" datatype="integer" isPrimaryKey="1">
|
|
<sequence start="1" increment="1"/>
|
|
</column>
|
|
<column name="reset_counter" datatype="integer"/>
|
|
</table>
|
|
</tables>
|
|
<views/>
|
|
<dbServiceStructs>
|
|
<serviceStruct name="OssResetCounter" table="oss_reset_counter"/>
|
|
<table name="oss_reset_counter"/>
|
|
</dbServiceStructs>
|
|
<topicTypes>
|
|
<topicType name="EquipmentErrorRegistration" isDataObject="1" autosubscribe="1" routeToClient="1" routeToServer="0" routeInReplay="0" recordTopic="1" baseValueType="Core::BaseEntity">
|
|
<column name="equipmentNumber" idlType="long"/>
|
|
<column name="sampleTime" idlType="long long"/>
|
|
<column name="participant" idlType="string"/>
|
|
<column name="device" idlType="string"/>
|
|
<column name="text" idlType="string"/>
|
|
</topicType>
|
|
<topicType name="EquipmentErrorRequest">
|
|
<column name="requestId" idlType="long" isKey="1"/>
|
|
<column name="equipmentNumber" idlType="long"/>
|
|
<column name="device" idlType="string"/>
|
|
<column name="text" idlType="string"/>
|
|
</topicType>
|
|
<topicType name="SendEquipmentMessageRequest">
|
|
<column name="requestId" idlType="long" isKey="1"/>
|
|
<column name="equipmentNumbers" idlType="sequence<long>"/>
|
|
<column name="sender" idlType="long"/>
|
|
<column name="senderType" idlType="Messaging::AddressType"/>
|
|
<column name="subject" idlType="string"/>
|
|
<column name="message" idlType="string"/>
|
|
</topicType>
|
|
</topicTypes>
|
|
<functionTopics>
|
|
<functionTopic name="EquipmentError" requestTopicType="EquipmentErrorRequest" replyTopicType="Core::FunctionReply" requestTopicName="EquipmentErrorRequest" replyTopicName="EquipmentErrorReply" routeInReplay="0"/>
|
|
<functionTopic name="SendEquipmentMessageOc" requestTopicType="SendEquipmentMessageRequest" replyTopicType="Core::FunctionReply" requestTopicName="SendEquipmentMessageOcRequest" replyTopicName="SendEquipmentMessageOcReply" routeInReplay="0"/>
|
|
</functionTopics>
|
|
<enumerations>
|
|
<enumeration name="DummyEnum">
|
|
<attribute key="dummy" value="0"/>
|
|
</enumeration>
|
|
</enumerations>
|
|
</service>
|