Merge story/release-validation-scope
Bring the validation-scope line (in-tree Jenkins CI copy, lcov coverage wiring, step-by-step release-scope README, TetraIF unit tests, the LogView runtime icon/resource fix, Dockerfile, rpmbuild and the new_docker_build.sh driver with the DEB output path) on top of the XmlPatterns branch pruned to the Release 2 scope. Conflict policy: - Out-of-scope targets/modules: keep the prune (deletion wins). - In-scope files that validation had deleted: restored from story/release-2-cleanup (the Release 2 closure, with the pruned-module guards). - In-scope sources carrying migration work: XmlPatterns versions (Qt XmlPatterns rework on QDomDocument, DDS member and logger fixes, first-build fixes). - Scope-aware CMakeLists (top level, PluginInterfaces, LtsWidgets) and .envrc: story/release-2-cleanup / ours versions.
This commit is contained in:
commit
cfe15c72c4
521 files changed
+37159
-36635
No files matched your search
@@ -20,15 +20,5 @@ IF(BUILD_RTI)
|
||||
ENDIF()
|
||||
ADD_SUBDIRECTORY(FTS)
|
||||
ADD_SUBDIRECTORY(Generic)
|
||||
ADD_SUBDIRECTORY(Routing)
|
||||
|
||||
ADD_SUBDIRECTORY(Core)
|
||||
|
||||
# During stepwise migration, add placeholder CTest entries before the
|
||||
# real DdsUnitTests subdir so the test-suite shows migration status even
|
||||
# when internal codegen targets are not yet available.
|
||||
ADD_SUBDIRECTORY(DdsUnitTestsPlaceholder)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
ADD_SUBDIRECTORY(DdsUnitTests)
|
||||
ENDIF()
|
||||
@@ -152,3 +152,8 @@ NGL_INSTALL_TARGET(svcCoreClient)
|
||||
CREATE_TOPIC_TYPE_PLUGIN(${xml_FILE})
|
||||
|
||||
ENDIF(BUILD_RTI)
|
||||
|
||||
#
|
||||
# Unit tests
|
||||
#
|
||||
ADD_SUBDIRECTORY(unit-test)
|
||||
@@ -1,5 +1,11 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Building Config - logging facility
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Christian Ehrlicher, SLSE, 2016-02-29
|
||||
*/
|
||||
|
||||
#include "logger.h"
|
||||
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Logging for ExerciseManagement
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Christian Ehrlicher, SLSE, 2016-02-29
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
|
||||
@@ -1,5 +1,13 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
*
|
||||
* Publisher
|
||||
* Uses DTSs to publish data
|
||||
*
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
#include "publisher.h"
|
||||
#include "pub_sub_base_p.h"
|
||||
|
||||
|
||||
@@ -1,5 +1,13 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
*
|
||||
* Publisher for DataSampleGeneration
|
||||
* Uses DTSs to publish data
|
||||
*
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QMap>
|
||||
|
||||
@@ -1,5 +1,13 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
*
|
||||
* Subscriber (DDSConnector)
|
||||
* Uses DTCs/DDTCs to subscribe to data
|
||||
*
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#include "subscriber.h"
|
||||
#include "pub_sub_base_p.h"
|
||||
|
||||
@@ -1,5 +1,13 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
*
|
||||
* Subscriber (Common)
|
||||
* Uses DDTCs to subscribe to data
|
||||
*
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include "pub_sub_base.h"
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* DTC TypeDefinitions
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* DataTopicClient (DTC) - Generic
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Interface for DataTopicServers (DTSs) - generic
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <dds/domain/DomainParticipant.hpp>
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* DataTopicServers (DTSs) - generic
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include "generic_dts.h"
|
||||
|
||||
@@ -5,14 +5,22 @@
|
||||
#
|
||||
|
||||
|
||||
# ddsftc
|
||||
ADD_LIBRARY(ddsftc INTERFACE)
|
||||
# ddsftc - Changed from INTERFACE to STATIC library to fix source path issues
|
||||
# When INTERFACE libraries provide sources, CMake compiles them in the consuming
|
||||
# target's directory context, causing path resolution issues with relative paths
|
||||
ADD_LIBRARY(ddsftc STATIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc_impl.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc_threading.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc_threading.cpp
|
||||
)
|
||||
TARGET_INCLUDE_DIRECTORIES(ddsftc
|
||||
INTERFACE
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../
|
||||
)
|
||||
TARGET_LINK_LIBRARIES(ddsftc
|
||||
INTERFACE
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
|
||||
ddsgen
|
||||
@@ -22,21 +30,12 @@ TARGET_LINK_LIBRARIES(ddsftc
|
||||
)
|
||||
IF(BUILD_RTI)
|
||||
TARGET_LINK_LIBRARIES(ddsftc
|
||||
INTERFACE
|
||||
PUBLIC
|
||||
ddsfts_connext
|
||||
RTI::nddsc
|
||||
RTI::nddscpp2
|
||||
)
|
||||
ENDIF()
|
||||
SET(SRCS
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc_impl.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc_threading.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc_threading.cpp
|
||||
)
|
||||
|
||||
TARGET_SOURCES(ddsftc INTERFACE ${SRCS})
|
||||
|
||||
|
||||
# ddsftccore
|
||||
|
||||
@@ -430,12 +430,9 @@ private:
|
||||
INFO_LOG(m_logger) << "#receiveReply for " << TopicNameHelper::replyTopicTypeName();
|
||||
// QueuedConnection to make sure the data is handled in the correct Qt (main) thread
|
||||
request.replySlot.invoke(m_objToInform, Qt::QueuedConnection,
|
||||
// Qt6: QMetaMethod::invoke takes QMetaMethodArgument; pass the
|
||||
// registered topic type name like Q_ARG does, but with the
|
||||
// runtime name (ReplyTopic is a template parameter).
|
||||
QtPrivate::Invoke::argument<ReplyTopic>(TopicNameHelper::replyTopicTypeName(), reply.data()),
|
||||
Q_ARG(int, request.uniqueId),
|
||||
Q_ARG(bool, !inProgress)); // finished yes/no
|
||||
Q_ARG(bool, !inProgress));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -1,6 +1,13 @@
|
||||
#pragma once
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Thread management for generic FTCs
|
||||
* $Id: generic_ftc_impl.h 62388 2024-03-27 10:41:26Z wille_m $
|
||||
* $HeadURL: svn://slssvn/TDS/branches/product/features/swp_2023_devel/Lts/DDS/FTC/generic_ftc_impl.h $
|
||||
* $Author: wille_m $
|
||||
*
|
||||
* Created by Mike Wille, ESZS, 27-03-2024
|
||||
*/
|
||||
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QAtomicInt>
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* GenericFTS Interface
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Generic Function Topic Server (FTS Replier)
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#include "generic_fts_internal.h"
|
||||
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Generic Function Topic Server (FTS Replier)
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
// Declares the FTS::GenericFts template that generic_fts_impl.h's
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* * DynamicDataReader
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* GenericBase
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#include "generic_base.h"
|
||||
|
||||
|
||||
@@ -1,5 +1,18 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* GenericBase (used as Base for all Generic<Items>)
|
||||
*
|
||||
* Items can be:
|
||||
* - DataReaderObject (DRO)
|
||||
* - DataWriterObject (DWO)
|
||||
* - DynamicDataReaderObject (DDRO)
|
||||
* - DataTopicClient (DTC)
|
||||
* - DataTopicServer (DTS)
|
||||
*
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* * GenericDataReader
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Logging for DDS modules
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#include "generic_logger.h"
|
||||
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Logging for DDS modules
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* SubscriberListener for the DataTopicClient (DTC)
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#include "subscriber_listener.h"
|
||||
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* SubscriberListener for the DataTopicClient (DTC)
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
|
||||
@@ -1,5 +1,12 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
*
|
||||
* DDTC Definition & TopicDescription
|
||||
*
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
// Include Qt headers FIRST to prevent namespace pollution when RTI DDS headers include Qt
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Handler which notifes the FTS-instances about new data
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
|
||||
#include "wait_set_handler.h"
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Handler which notifes the FTS-instances about new data
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
|
||||
@@ -25,6 +25,12 @@ NGL_ADD_LIBRARY2(AAR SV HLA WS ddsQoS SHARED ${SRCS})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(ddsQoS
|
||||
INTERFACE
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../
|
||||
# Consumers (the generated *_topic_type_plugin.cpp) include
|
||||
# DDS_DefaultQos.h -> ddsqos_export.h; the export header is generated
|
||||
# into the binary dir, so export it the same way ddsfts exports its
|
||||
# ddsfts_export.h. Without this every <svc>TopicTypePlugin target fails
|
||||
# to compile ("ddsqos_export.h: No such file or directory").
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
)
|
||||
NGL_TARGET_LINK_LIBRARIES(ddsQoS
|
||||
PRIVATE
|
||||
@@ -37,3 +43,8 @@ NGL_TARGET_LINK_LIBRARIES(ddsQoS
|
||||
)
|
||||
|
||||
ENDIF(BUILD_RTI)
|
||||
|
||||
#
|
||||
# Unit tests
|
||||
#
|
||||
ADD_SUBDIRECTORY(unit-test)
|
||||
@@ -1,5 +1,10 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Configuration of the default QoS
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#include "DDS_DefaultQos.h"
|
||||
|
||||
|
||||
@@ -1,5 +1,13 @@
|
||||
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Configuration of the default QoS:
|
||||
* - Reading default profile (xml)
|
||||
* - added Parameter
|
||||
*
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
|
||||
Reference in new issue
Block a user