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
3.7 KiB
XML
65 lines
3.7 KiB
XML
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
|
<service namespace="OcSituationClient" abbreviation="OSC" procNames="OcSituationClient" exerciseDependency="Exercise" groups="ExercisePreparation,ExerciseExecution,ExercisePaused">
|
|
<rcs>
|
|
<Id Id="$Id: ea_export_script.txt 36918 2017-11-08 07:54:09Z 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="osc_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="OscResetCounter" table="osc_reset_counter"/>
|
|
<table name="osc_reset_counter"/>
|
|
</dbServiceStructs>
|
|
<topicTypes>
|
|
<topicType name="SendDemandEvaluationSchemaRequest">
|
|
<column name="schemaId" idlType="long"/>
|
|
</topicType>
|
|
<topicType name="SendDemandSituationRequest">
|
|
<column name="centerEquipmentId" idlType="long"/>
|
|
<column name="radius" idlType="long"/>
|
|
<column name="position" idlType="Core::GeoPosition2D" isOptional="1"/>
|
|
<column name="filterActive" idlType="boolean" />
|
|
<column name="partyList" idlType="sequence<long>"/>
|
|
<column name="typeClassList" idlType="sequence<long>"/>
|
|
</topicType>
|
|
<topicType name="SendEquipmentErrorRegistrationRequest">
|
|
<column name="ocEquipmentNumber" idlType="long"/>
|
|
<column name="faultEquipmentNumber" idlType="string"/>
|
|
<column name="device" idlType="string"/>
|
|
<column name="text" idlType="string"/>
|
|
</topicType>
|
|
<topicType name="SendEquipmentRegistrationRequest">
|
|
<column name="participantId" idlType="long"/>
|
|
<column name="equipmentNumber" idlType="long"/>
|
|
</topicType>
|
|
<topicType name="SendEvaluationRequest">
|
|
<column name="schemaId" idlType="long"/>
|
|
<column name="senderOperatorId" idlType="long"/>
|
|
<column name="receiverOperatorId" idlType="long" isOptional="1"/>
|
|
<column name="timeStamp" idlType="long long"/>
|
|
<column name="hierarchy" idlType="string"/>
|
|
<column name="text" idlType="string"/>
|
|
</topicType>
|
|
</topicTypes>
|
|
<functionTopics>
|
|
<functionTopic name="SendDemandEvaluationSchema" requestTopicType="SendDemandEvaluationSchemaRequest" replyTopicType="Core::FunctionReply" requestTopicName="SendDemandEvaluationSchemaRequest" replyTopicName="SendDemandEvaluationSchemaReply" routeInReplay="0"/>
|
|
<functionTopic name="SendDemandSituation" requestTopicType="SendDemandSituationRequest" replyTopicType="Core::FunctionReply" requestTopicName="SendDemandSituationRequest" replyTopicName="SendDemandSituationReply" routeInReplay="0"/>
|
|
<functionTopic name="SendEquipmentErrorRegistration" requestTopicType="SendEquipmentErrorRegistrationRequest" replyTopicType="Core::FunctionReply" requestTopicName="SendEquipmentErrorRegistrationRequest" replyTopicName="SendEquipmentErrorRegistrationReply" routeInReplay="0"/>
|
|
<functionTopic name="SendEquipmentRegistration" requestTopicType="SendEquipmentRegistrationRequest" replyTopicType="Core::FunctionReply" requestTopicName="SendEquipmentRegistrationRequest" replyTopicName="SendEquipmentRegistrationReply" routeInReplay="0"/>
|
|
<functionTopic name="SendEvaluation" requestTopicType="SendEvaluationRequest" replyTopicType="Core::FunctionReply" requestTopicName="SendEvaluationRequest" replyTopicName="SendEvaluationReply" routeInReplay="0"/>
|
|
</functionTopics>
|
|
<enumerations>
|
|
<enumeration name="DummyEnum">
|
|
<attribute key="dummy" value="0"/>
|
|
</enumeration>
|
|
</enumerations>
|
|
</service>
|