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
@@ -1,29 +1,29 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#
|
||||
# @RDE_HEADER@
|
||||
# $Revision$
|
||||
# $Date$
|
||||
# $Id$
|
||||
#
|
||||
# Created by Hanna E. Rathje, SLSE, 2015-08-24
|
||||
#
|
||||
# PURPOSE:
|
||||
# --------
|
||||
# CODEGEN_IDL_SVC srcList xmlFile_in
|
||||
# CODEGEN_TOPIC_TYPEDEFS srcList xmlFile_in
|
||||
# -->
|
||||
# CODEGEN_DTC_TYPE_DEF(${srcList} ${xmlFile_in}
|
||||
# CODEGEN_DTS_TYPE_DEF(${srcList} ${xmlFile_in}
|
||||
# CODEGEN_FTC_TYPE_DEF(${srcList} ${xmlFile_in}
|
||||
# CODEGEN_FTS_TYPE_DEF(${srcList} ${xmlFile_in}
|
||||
# CODEGEN_CLIENT_TOPICS srcList xmlFile_in
|
||||
# CODEGEN_SERVER_TOPICS srcList xmlFile_in
|
||||
# CODEGEN_WRITE_SERVICEFILE_INFO
|
||||
#
|
||||
# From a given xml-File (i.e exm_service.xml) an <service_abbr>.idl (i.e. exm.idl) will be generated
|
||||
# The idl-template file is the input file
|
||||
#
|
||||
# The program codegen_exe does the generation with the action "IDL"
|
||||
#
|
||||
|
||||
INCLUDE(CMakeParseArguments)
|
||||
|
||||
@@ -426,6 +426,10 @@ MACRO(CODEGEN_TOPIC_TYPE_PLUGIN srcList xmlFile_in)
|
||||
ENDMACRO()
|
||||
|
||||
MACRO(CREATE_TOPIC_TYPE_PLUGIN xmlFile_in)
|
||||
# The generated plugin includes <DDS/Routing/routing_plugin.h> and links
|
||||
# routing_plugin; that module was pruned from the tree (prune commit
|
||||
# 7fc6f6664), so the target is only created when the module is present.
|
||||
IF(EXISTS "${CMAKE_SOURCE_DIR}/Lts/DDS/Routing")
|
||||
SET(_my_srcs "")
|
||||
_GET_SERVICENAME( "${xmlFile_in}" svcNameOut )
|
||||
CODEGEN_TOPIC_TYPE_PLUGIN(_my_srcs ${xmlFile_in})
|
||||
@@ -445,6 +449,10 @@ MACRO(CREATE_TOPIC_TYPE_PLUGIN xmlFile_in)
|
||||
NGL_TARGET_LINK_LIBRARIES(${svcNameOut}TopicTypePlugin
|
||||
topic_type_plugin
|
||||
routing_plugin
|
||||
# The generated *_topic_type_plugin.cpp includes generic_fts_impl.h
|
||||
# -> DDS_DefaultQos.h -> "ddsqos_export.h", which is generated into
|
||||
# ddsQoS's binary dir; linking ddsQoS propagates that include dir.
|
||||
ddsQoS
|
||||
ddscore
|
||||
ddsftccore
|
||||
# The generated *_topic_type_plugin.cpp includes generic_fts_impl.h
|
||||
@@ -454,6 +462,7 @@ MACRO(CREATE_TOPIC_TYPE_PLUGIN xmlFile_in)
|
||||
${_commonLib}
|
||||
)
|
||||
NGL_INSTALL_TARGET(${svcNameOut}TopicTypePlugin)
|
||||
ENDIF()
|
||||
ENDMACRO()
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user