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
@@ -29,6 +29,9 @@ SET(SRCS_common
|
||||
# these build-dir paths, so the copies are gone rather than kept for forbidden
|
||||
# OFF variants.
|
||||
|
||||
# Define target name early for use in subsequent macros
|
||||
SET(PDM_COMMON_TARGET svcPdmCommon)
|
||||
|
||||
# Add current binary dir to include path for generated headers
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(${PDM_COMMON_TARGET}
|
||||
PUBLIC
|
||||
@@ -98,7 +101,6 @@ IF(BUILD_RTI)
|
||||
ENDIF()
|
||||
|
||||
# Create svcPdmCommon library with common sources
|
||||
SET(PDM_COMMON_TARGET svcPdmCommon)
|
||||
NGL_ADD_LIBRARY(AAR SV WS HLA ${PDM_COMMON_TARGET} SHARED ${SRCS_common})
|
||||
generate_export_header(${PDM_COMMON_TARGET}
|
||||
EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/svcpdmcommon_export.h"
|
||||
|
||||
+27
-27
@@ -1,28 +1,28 @@
|
||||
-- all available service idl files
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/build-rti-on/Lts/DDS/Core/core.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/build-rti-on/Lts/DDS/Core/core_enums.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/core.xml
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_enums.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_service.xml
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/bld.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/bld_enums.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/bld_service.xml
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_enums.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_service.xml
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/taboc.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/taboc_enums.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/taboc_service.xml
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/gna.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/gna_enums.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/gna_service.xml
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/cmo.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/cmo_enums.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/cmo_service.xml
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/whg.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/whg_enums.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/whg_service.xml
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/tgt.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/tgt_enums.idl
|
||||
/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/tgt_service.xml
|
||||
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/build-rti-on/Lts/DDS/Core/core.idl
|
||||
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/build-rti-on/Lts/DDS/Core/core_enums.idl
|
||||
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/core.xml
|
||||
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm.idl
|
||||
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_enums.idl
|
||||
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_service.xml
|
||||
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/bld.idl
|
||||
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/bld_enums.idl
|
||||
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/bld_service.xml
|
||||
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab.idl
|
||||
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_enums.idl
|
||||
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_service.xml
|
||||
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/taboc.idl
|
||||
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/taboc_enums.idl
|
||||
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/taboc_service.xml
|
||||
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/gna.idl
|
||||
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/gna_enums.idl
|
||||
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/gna_service.xml
|
||||
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/cmo.idl
|
||||
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/cmo_enums.idl
|
||||
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/cmo_service.xml
|
||||
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/whg.idl
|
||||
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/whg_enums.idl
|
||||
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/whg_service.xml
|
||||
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/tgt.idl
|
||||
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/tgt_enums.idl
|
||||
${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/tgt_service.xml
|
||||
+65
-55
@@ -1,5 +1,3 @@
|
||||
// Stub file for pdm - BUILD_RTI=OFF
|
||||
// Auto-generated stub to replace RTI IDL-generated code
|
||||
|
||||
#ifndef PDM_HPP
|
||||
#define PDM_HPP
|
||||
@@ -10,37 +8,39 @@
|
||||
#include <QString>
|
||||
#include <QStringList>
|
||||
|
||||
// Forward declarations and stub types for ProjectDataManagement namespace
|
||||
// Used when BUILD_RTI=OFF to allow compilation without RTI Connext DDS
|
||||
namespace ProjectDataManagement
|
||||
{
|
||||
|
||||
namespace ProjectDataManagement {
|
||||
|
||||
// Stub types for RTI IDL-generated classes
|
||||
struct RadioGroup {
|
||||
// Stub types for RTI IDL-generated classes
|
||||
struct RadioGroup
|
||||
{
|
||||
int m_id = 0;
|
||||
int id() const { return m_id; }
|
||||
void id(int val) { m_id = val; }
|
||||
};
|
||||
};
|
||||
|
||||
struct ChargeType {
|
||||
struct ChargeType
|
||||
{
|
||||
int m_id = 0;
|
||||
QString m_properties;
|
||||
int id() const { return m_id; }
|
||||
void id(int val) { m_id = val; }
|
||||
QString properties() const { return m_properties; }
|
||||
void properties(const QString& val) { m_properties = val; }
|
||||
};
|
||||
void properties(const QString &val) { m_properties = val; }
|
||||
};
|
||||
|
||||
struct GearClass {
|
||||
struct GearClass
|
||||
{
|
||||
int m_id = 0;
|
||||
QString m_properties;
|
||||
int id() const { return m_id; }
|
||||
void id(int val) { m_id = val; }
|
||||
QString properties() const { return m_properties; }
|
||||
void properties(const QString& val) { m_properties = val; }
|
||||
};
|
||||
void properties(const QString &val) { m_properties = val; }
|
||||
};
|
||||
|
||||
struct GearType {
|
||||
struct GearType
|
||||
{
|
||||
int m_id = 0;
|
||||
int m_gearClassId = 0;
|
||||
QString m_properties;
|
||||
@@ -49,10 +49,11 @@ struct GearType {
|
||||
int gearClassId() const { return m_gearClassId; }
|
||||
void gearClassId(int val) { m_gearClassId = val; }
|
||||
QString properties() const { return m_properties; }
|
||||
void properties(const QString& val) { m_properties = val; }
|
||||
};
|
||||
void properties(const QString &val) { m_properties = val; }
|
||||
};
|
||||
|
||||
struct GearTypeChargeType {
|
||||
struct GearTypeChargeType
|
||||
{
|
||||
int m_id = 0;
|
||||
int m_gearTypeId = 0;
|
||||
int m_chargeTypeId = 0;
|
||||
@@ -64,64 +65,71 @@ struct GearTypeChargeType {
|
||||
int chargeTypeId() const { return m_chargeTypeId; }
|
||||
void chargeTypeId(int val) { m_chargeTypeId = val; }
|
||||
QString properties() const { return m_properties; }
|
||||
void properties(const QString& val) { m_properties = val; }
|
||||
};
|
||||
void properties(const QString &val) { m_properties = val; }
|
||||
};
|
||||
|
||||
struct BuildingChargeEffect {
|
||||
struct BuildingChargeEffect
|
||||
{
|
||||
int m_id = 0;
|
||||
QString m_properties;
|
||||
int id() const { return m_id; }
|
||||
void id(int val) { m_id = val; }
|
||||
QString properties() const { return m_properties; }
|
||||
void properties(const QString& val) { m_properties = val; }
|
||||
};
|
||||
void properties(const QString &val) { m_properties = val; }
|
||||
};
|
||||
|
||||
struct VulnerabilityKind {
|
||||
struct VulnerabilityKind
|
||||
{
|
||||
int m_id = 0;
|
||||
QString m_properties;
|
||||
int id() const { return m_id; }
|
||||
void id(int val) { m_id = val; }
|
||||
QString properties() const { return m_properties; }
|
||||
void properties(const QString& val) { m_properties = val; }
|
||||
};
|
||||
void properties(const QString &val) { m_properties = val; }
|
||||
};
|
||||
|
||||
struct IgniterType {
|
||||
struct IgniterType
|
||||
{
|
||||
int m_id = 0;
|
||||
QString m_properties;
|
||||
int id() const { return m_id; }
|
||||
void id(int val) { m_id = val; }
|
||||
QString properties() const { return m_properties; }
|
||||
void properties(const QString& val) { m_properties = val; }
|
||||
};
|
||||
void properties(const QString &val) { m_properties = val; }
|
||||
};
|
||||
|
||||
struct LoadType {
|
||||
struct LoadType
|
||||
{
|
||||
int m_id = 0;
|
||||
QString m_properties;
|
||||
int id() const { return m_id; }
|
||||
void id(int val) { m_id = val; }
|
||||
QString properties() const { return m_properties; }
|
||||
void properties(const QString& val) { m_properties = val; }
|
||||
};
|
||||
void properties(const QString &val) { m_properties = val; }
|
||||
};
|
||||
|
||||
struct CanComponentString {
|
||||
struct CanComponentString
|
||||
{
|
||||
int m_id = 0;
|
||||
QString m_text;
|
||||
int id() const { return m_id; }
|
||||
void id(int val) { m_id = val; }
|
||||
QString text() const { return m_text; }
|
||||
void text(const QString& val) { m_text = val; }
|
||||
};
|
||||
void text(const QString &val) { m_text = val; }
|
||||
};
|
||||
|
||||
struct BiteComponentText {
|
||||
struct BiteComponentText
|
||||
{
|
||||
int m_id = 0;
|
||||
QString m_text;
|
||||
int id() const { return m_id; }
|
||||
void id(int val) { m_id = val; }
|
||||
QString text() const { return m_text; }
|
||||
void text(const QString& val) { m_text = val; }
|
||||
};
|
||||
void text(const QString &val) { m_text = val; }
|
||||
};
|
||||
|
||||
struct SanitationProcedure {
|
||||
struct SanitationProcedure
|
||||
{
|
||||
int m_id = 0;
|
||||
QString m_name;
|
||||
QString m_longName;
|
||||
@@ -130,15 +138,15 @@ struct SanitationProcedure {
|
||||
int m_minimumQualification = 0;
|
||||
int m_dataCode = 0;
|
||||
QString m_version;
|
||||
|
||||
|
||||
int id() const { return m_id; }
|
||||
void id(int val) { m_id = val; }
|
||||
QString name() const { return m_name; }
|
||||
void name(const QString& val) { m_name = val; }
|
||||
void name(const QString &val) { m_name = val; }
|
||||
QString longName() const { return m_longName; }
|
||||
void longName(const QString& val) { m_longName = val; }
|
||||
void longName(const QString &val) { m_longName = val; }
|
||||
QString type() const { return m_type; }
|
||||
void type(const QString& val) { m_type = val; }
|
||||
void type(const QString &val) { m_type = val; }
|
||||
int typeId() const { return m_typeId; }
|
||||
void typeId(int val) { m_typeId = val; }
|
||||
int minimumQualification() const { return m_minimumQualification; }
|
||||
@@ -146,21 +154,22 @@ struct SanitationProcedure {
|
||||
int dataCode() const { return m_dataCode; }
|
||||
void dataCode(int val) { m_dataCode = val; }
|
||||
QString version() const { return m_version; }
|
||||
void version(const QString& val) { m_version = val; }
|
||||
};
|
||||
void version(const QString &val) { m_version = val; }
|
||||
};
|
||||
|
||||
struct SanitationInjury {
|
||||
struct SanitationInjury
|
||||
{
|
||||
int m_id = 0;
|
||||
QString m_name;
|
||||
int m_kind = 0;
|
||||
int m_place1 = 0;
|
||||
int m_place2 = 0;
|
||||
int m_vbg = 0;
|
||||
|
||||
|
||||
int id() const { return m_id; }
|
||||
void id(int val) { m_id = val; }
|
||||
QString name() const { return m_name; }
|
||||
void name(const QString& val) { m_name = val; }
|
||||
void name(const QString &val) { m_name = val; }
|
||||
int kind() const { return m_kind; }
|
||||
void kind(int val) { m_kind = val; }
|
||||
int place1() const { return m_place1; }
|
||||
@@ -169,13 +178,14 @@ struct SanitationInjury {
|
||||
void place2(int val) { m_place2 = val; }
|
||||
int vbg() const { return m_vbg; }
|
||||
void vbg(int val) { m_vbg = val; }
|
||||
};
|
||||
};
|
||||
|
||||
// Forward declaration for Interface::Dtc
|
||||
namespace Interface {
|
||||
class Dtc;
|
||||
}
|
||||
// Forward declaration for Interface::Dtc
|
||||
namespace Interface
|
||||
{
|
||||
class Dtc;
|
||||
}
|
||||
|
||||
} // namespace ProjectDataManagement
|
||||
|
||||
#endif // PDM_HPP
|
||||
#endif // PDM_HPP
|
||||
+12
-12
@@ -1,21 +1,21 @@
|
||||
// Stub file for pdm_db - BUILD_RTI=OFF
|
||||
// Auto-generated stub to replace RTI IDL-generated database code
|
||||
|
||||
#ifndef PDM_DB_STUB_HPP
|
||||
#define PDM_DB_STUB_HPP
|
||||
|
||||
#include "pdm_enums_stub.hpp"
|
||||
|
||||
namespace pdm {
|
||||
namespace db {
|
||||
namespace pdm
|
||||
{
|
||||
namespace db
|
||||
{
|
||||
|
||||
// Stub class to replace RTI IDL-generated database types
|
||||
class ProjectDatabase {
|
||||
public:
|
||||
virtual ~ProjectDatabase() = default;
|
||||
};
|
||||
// Stub class to replace RTI IDL-generated database types
|
||||
class ProjectDatabase
|
||||
{
|
||||
public:
|
||||
virtual ~ProjectDatabase() = default;
|
||||
};
|
||||
|
||||
} // namespace db
|
||||
} // namespace db
|
||||
} // namespace pdm
|
||||
|
||||
#endif // PDM_DB_STUB_HPP
|
||||
#endif // PDM_DB_STUB_HPP
|
||||
+19
-16
@@ -1,26 +1,29 @@
|
||||
// Stub file for pdm_enums - BUILD_RTI=OFF
|
||||
// Auto-generated stub to replace RTI IDL-generated code
|
||||
|
||||
#ifndef PDM_ENUMS_STUB_HPP
|
||||
#define PDM_ENUMS_STUB_HPP
|
||||
|
||||
namespace pdm {
|
||||
namespace enums {
|
||||
namespace pdm
|
||||
{
|
||||
namespace enums
|
||||
{
|
||||
|
||||
// Stub enums to replace RTI IDL-generated types
|
||||
enum class ProjectState : int {
|
||||
Unknown = 0
|
||||
};
|
||||
// Stub enums to replace RTI IDL-generated types
|
||||
enum class ProjectState : int
|
||||
{
|
||||
Unknown = 0
|
||||
};
|
||||
|
||||
enum class ProjectType : int {
|
||||
Unknown = 0
|
||||
};
|
||||
enum class ProjectType : int
|
||||
{
|
||||
Unknown = 0
|
||||
};
|
||||
|
||||
enum class GearClass : int {
|
||||
Unknown = 0
|
||||
};
|
||||
enum class GearClass : int
|
||||
{
|
||||
Unknown = 0
|
||||
};
|
||||
|
||||
} // namespace enums
|
||||
} // namespace enums
|
||||
} // namespace pdm
|
||||
|
||||
#endif // PDM_ENUMS_STUB_HPP
|
||||
#endif // PDM_ENUMS_STUB_HPP
|
||||
+10
-9
@@ -1,22 +1,23 @@
|
||||
// Stub file for pdm - BUILD_RTI=OFF
|
||||
// Auto-generated stub to replace RTI IDL-generated code
|
||||
|
||||
#ifndef PDM_STUB_HPP
|
||||
#define PDM_STUB_HPP
|
||||
|
||||
#include "pdm_enums_stub.hpp"
|
||||
|
||||
namespace pdm {
|
||||
namespace pdm
|
||||
{
|
||||
|
||||
// Stub structs to replace RTI IDL-generated types
|
||||
struct ProjectData {
|
||||
// Stub structs to replace RTI IDL-generated types
|
||||
struct ProjectData
|
||||
{
|
||||
int id = 0;
|
||||
};
|
||||
};
|
||||
|
||||
struct ProjectConfig {
|
||||
struct ProjectConfig
|
||||
{
|
||||
int projectId = 0;
|
||||
};
|
||||
};
|
||||
|
||||
} // namespace pdm
|
||||
|
||||
#endif // PDM_STUB_HPP
|
||||
#endif // PDM_STUB_HPP
|
||||
Reference in new issue
Block a user