From a17b4316699e3dff134695eae8fcbdfdc2923705 Mon Sep 17 00:00:00 2001 From: berrux_dev Date: Wed, 14 Oct 2026 20:30:09 +0200 Subject: [PATCH] Trim stub header comments and redundant explanations - Drop the 'Stub file ... BUILD_RTI=OFF / Auto-generated' headers from the tab_* and pdm_* stub files (RTI is gone on this branch; the names say it) - Drop stub comments from MockCoordTrans.h and the coordTransTests placeholders - Drop the DDS exclusion list comment from Lts/Common/CMakeLists.txt - Shorten the staging and packages-out comments in new_docker_build.sh --- .../qt6-migrated-legatus/Lts/Common/CMakeLists.txt | 6 ------ .../coordTransTests_gtest.cpp | 2 +- .../coordTransTests_smoke.cpp | 2 +- .../CommonUnitTestsPlaceholder/mocks/MockCoordTrans.h | 2 -- .../Lts/Proxies/TrainingAreaBase/stubs/tab_db_stub.hpp | 2 -- .../Proxies/TrainingAreaBase/stubs/tab_enums_stub.hpp | 2 -- .../Lts/Proxies/TrainingAreaBase/stubs/tab_stub.hpp | 3 --- .../stubs/tab_topic_type_plugin_stub.cpp | 3 --- .../stubs/ProjectDataManagement/pdm.hpp | 5 ----- .../ProjectDataManagement/stubs/pdm_db_stub.hpp | 3 --- .../ProjectDataManagement/stubs/pdm_enums_stub.hpp | 2 -- .../Services/ProjectDataManagement/stubs/pdm_stub.hpp | 2 -- qt6-after/qt6-migrated-legatus/new_docker_build.sh | 10 +--------- 13 files changed, 3 insertions(+), 41 deletions(-) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/CMakeLists.txt index f18cebd28..29b06cd8d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CMakeLists.txt @@ -4,12 +4,6 @@ # $Author$ # -# Release scope: modules with DDS/RTI dependencies not needed for TetraIF/Z are excluded -# DDS-dependent modules: CodeGen, LtsAppManager, LtsBotan, LtsCoordinate, LtsElevation, -# LtsLogin, LtsMultiMonitor, LtsPluginManager, LtsPrinting, LtsProjectionWorkstation, -# LtsScriptTimeline, LtsSession, LtsTimelineClassic, LtsVirtualKeyboard, LtsWidgets, -# PluginInterfaces (TopicReplayInterface, RecordReplayPlugin), TopicEditorBase - # Core modules needed for TetraIF and Z ADD_SUBDIRECTORY(CommonUnitTestsPlaceholder) ADD_SUBDIRECTORY(httq) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CommonUnitTestsPlaceholder/coordTransTests_gtest.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/CommonUnitTestsPlaceholder/coordTransTests_gtest.cpp index c679f4167..70c3cf78c 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/CommonUnitTestsPlaceholder/coordTransTests_gtest.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CommonUnitTestsPlaceholder/coordTransTests_gtest.cpp @@ -1,4 +1,4 @@ -// Stub GTest smoke test for coordTrans + #include TEST(CoordTransSmokeTest, StubTest) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CommonUnitTestsPlaceholder/coordTransTests_smoke.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/CommonUnitTestsPlaceholder/coordTransTests_smoke.cpp index 2a42c5ab4..075d720e1 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/CommonUnitTestsPlaceholder/coordTransTests_smoke.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CommonUnitTestsPlaceholder/coordTransTests_smoke.cpp @@ -1,4 +1,4 @@ -// Stub QtTest smoke test for coordTrans + #include class CoordTransSmokeTest : public QObject diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CommonUnitTestsPlaceholder/mocks/MockCoordTrans.h b/qt6-after/qt6-migrated-legatus/Lts/Common/CommonUnitTestsPlaceholder/mocks/MockCoordTrans.h index ae808883d..5b455b14b 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/CommonUnitTestsPlaceholder/mocks/MockCoordTrans.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CommonUnitTestsPlaceholder/mocks/MockCoordTrans.h @@ -1,5 +1,3 @@ -// MockCoordTrans.h - Stub mock for CoordTrans functionality -// This is a placeholder to allow builds without full CoordTrans implementation #ifndef MOCK_COORD_TRANS_H #define MOCK_COORD_TRANS_H diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/stubs/tab_db_stub.hpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/stubs/tab_db_stub.hpp index 4567dfad1..caaae2657 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/stubs/tab_db_stub.hpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/stubs/tab_db_stub.hpp @@ -1,5 +1,3 @@ -// Stub file for tab_db - BUILD_RTI=OFF -// Auto-generated stub to replace RTI IDL-generated database code #ifndef TAB_DB_STUB_HPP #define TAB_DB_STUB_HPP diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/stubs/tab_enums_stub.hpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/stubs/tab_enums_stub.hpp index 8da12a92c..e24235224 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/stubs/tab_enums_stub.hpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/stubs/tab_enums_stub.hpp @@ -1,5 +1,3 @@ -// Stub file for tab_enums - BUILD_RTI=OFF -// Auto-generated stub to replace RTI IDL-generated enums #ifndef TAB_ENUMS_STUB_HPP #define TAB_ENUMS_STUB_HPP diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/stubs/tab_stub.hpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/stubs/tab_stub.hpp index 8536b32af..6d4f0addd 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/stubs/tab_stub.hpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/stubs/tab_stub.hpp @@ -1,6 +1,3 @@ -// Stub file for tab types - BUILD_RTI=OFF -// Auto-generated stub to replace RTI IDL-generated types - #ifndef TAB_STUB_HPP #define TAB_STUB_HPP diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/stubs/tab_topic_type_plugin_stub.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/stubs/tab_topic_type_plugin_stub.cpp index 9534d7cf4..2710dfda7 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/stubs/tab_topic_type_plugin_stub.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/stubs/tab_topic_type_plugin_stub.cpp @@ -1,6 +1,3 @@ -// Stub file for tab_topic_type_plugin - BUILD_RTI=OFF -// Auto-generated stub to replace RTI IDL-generated plugin code - #include "tab_enums_stub.hpp" namespace tab diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/stubs/ProjectDataManagement/pdm.hpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/stubs/ProjectDataManagement/pdm.hpp index d19d9b137..72d9acbda 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/stubs/ProjectDataManagement/pdm.hpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/stubs/ProjectDataManagement/pdm.hpp @@ -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,9 +8,6 @@ #include #include -// Forward declarations and stub types for ProjectDataManagement namespace -// Used when BUILD_RTI=OFF to allow compilation without RTI Connext DDS - namespace ProjectDataManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/stubs/pdm_db_stub.hpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/stubs/pdm_db_stub.hpp index 86581a4e9..1524dee39 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/stubs/pdm_db_stub.hpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/stubs/pdm_db_stub.hpp @@ -1,6 +1,3 @@ -// 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 diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/stubs/pdm_enums_stub.hpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/stubs/pdm_enums_stub.hpp index 52ba052b5..567a53862 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/stubs/pdm_enums_stub.hpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/stubs/pdm_enums_stub.hpp @@ -1,5 +1,3 @@ -// 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 diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/stubs/pdm_stub.hpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/stubs/pdm_stub.hpp index 37073b14e..9b456bbba 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/stubs/pdm_stub.hpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/stubs/pdm_stub.hpp @@ -1,5 +1,3 @@ -// Stub file for pdm - BUILD_RTI=OFF -// Auto-generated stub to replace RTI IDL-generated code #ifndef PDM_STUB_HPP #define PDM_STUB_HPP diff --git a/qt6-after/qt6-migrated-legatus/new_docker_build.sh b/qt6-after/qt6-migrated-legatus/new_docker_build.sh index 3aa0d3712..9d87e69d6 100755 --- a/qt6-after/qt6-migrated-legatus/new_docker_build.sh +++ b/qt6-after/qt6-migrated-legatus/new_docker_build.sh @@ -487,9 +487,6 @@ if [[ "${RUN_JENKINS_BUILDER}" == "ON" ]]; then STAGE_DIR=/workspace/deb_stage STAGED_SOURCE_DIR="${STAGE_DIR}/qt-migration-legatus/qt6-after/qt6-migrated-legatus" - # Stage the workspace as a clean copy. The workspace itself is NEVER - # deleted (it contains git-managed sources); only the staging - # subdirectory is removed. log_info "Staging workspace to ${STAGE_DIR}" rm -rf "${STAGE_DIR}" mkdir -p "${STAGE_DIR}" @@ -525,12 +522,7 @@ if [[ "${RUN_JENKINS_BUILDER}" == "ON" ]]; then exit 1 fi - # Copy produced DEB packages to the packages-out mount (host: - # ${PACKAGE_OUTPUT_DIR}, container: /workspace/packages-out) so they are - # available on the host after the container exits. - # make_rpm already writes to /workspace/rpms/... (the host workspace - # mount), so when the host's PACKAGE_OUTPUT_DIR is that same directory - # the packages are already in place - skip copying onto themselves. + # Copy produced DEB packages to the packages-out DEST_DIR=/workspace/packages-out mkdir -p "${DEST_DIR}" shopt -s nullglob