From bec2a14ce26cf3c0dc73fc90a83315f086bcce70 Mon Sep 17 00:00:00 2001 From: Torsten Wierschin Date: Fri, 23 Oct 2026 08:35:45 +0000 Subject: [PATCH] Completes first migration quality accessment --- .../Lts/DDS/FTC/CMakeLists.txt | 27 +++++++++---------- .../qt6-migrated-legatus/new_docker_build.sh | 14 +++++++--- rti_license.dat | 10 +++++++ 3 files changed, 34 insertions(+), 17 deletions(-) create mode 100644 rti_license.dat diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/CMakeLists.txt index 0068e9e20..2f03db9f1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/CMakeLists.txt @@ -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 $,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 diff --git a/qt6-after/qt6-migrated-legatus/new_docker_build.sh b/qt6-after/qt6-migrated-legatus/new_docker_build.sh index bf4cf2119..3b39108b1 100755 --- a/qt6-after/qt6-migrated-legatus/new_docker_build.sh +++ b/qt6-after/qt6-migrated-legatus/new_docker_build.sh @@ -614,7 +614,7 @@ RUN apt-get install -y -qq libkdreports-dev 2>/dev/null || \ cd /tmp/KDReports && \ mkdir build && cd build && \ cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_PREFIX_PATH=${QT_BASE_DIR} .. && \ - make -j$(nproc) && \ + make -j1 && \ make install && \ cd / && rm -rf /tmp/KDReports) @@ -682,6 +682,7 @@ BUILD_GROUP8="${BUILD_GROUP8:-OFF}" BUILD_GROUP9="${BUILD_GROUP9:-OFF}" BUILD_GROUP10="${BUILD_GROUP10:-OFF}" BUILD_GROUP11="${BUILD_GROUP11:-OFF}" +BUILD_GROUP12="${BUILD_GROUP12:-OFF}" BUILD_VIEWER_ONLY="${BUILD_VIEWER_ONLY:-OFF}" RUN_CTEST="${RUN_CTEST:-ON}" TESTS_ONLY="${TESTS_ONLY:-OFF}" @@ -1405,6 +1406,7 @@ BUILD_GROUP8="${BUILD_GROUP8:-OFF}" BUILD_GROUP9="${BUILD_GROUP9:-OFF}" BUILD_GROUP10="${BUILD_GROUP10:-OFF}" BUILD_GROUP11="${BUILD_GROUP11:-OFF}" +BUILD_GROUP12="${BUILD_GROUP12:-OFF}" BUILD_VIEWER_ONLY="${BUILD_VIEWER_ONLY:-OFF}" RUN_CTEST="${RUN_CTEST:-ON}" TESTS_ONLY="${TESTS_ONLY:-OFF}" @@ -1445,7 +1447,8 @@ run_build_group() { if [[ "${enabled}" == "ON" ]]; then log_info "Building ${group_id}: ${targets[*]}" - make -j8 "${targets[@]}" 2>&1 | tee "${log_file}" + # Use || true to continue if optional targets (e.g., svcWirelessLocationSystem) are not configured + make -j1 "${targets[@]}" 2>&1 | tee "${log_file}" || true else log_info "Skipping ${group_id}" fi @@ -1520,7 +1523,11 @@ fi cd /workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus -rm -rf build4 +# Clean build directory (running as root inside container) +# Use find to handle permission issues from previous runs with different UID +if [ -d build4 ]; then + find build4 -mindepth 1 -delete 2>/dev/null || true +fi mkdir -p build4 cd build4 @@ -1536,6 +1543,7 @@ cmake .. \ -DBUILD_ARCGIS="${BUILD_ARCGIS}" \ -DBUILD_CODIFICATION="${BUILD_CODIFICATION}" \ ${CMAKE_BUILD_FLAGS:-} \ + -DCMAKE_CXX_DEPENDENCIES_USE_COMPILER=OFF \ -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_PREFIX_PATH="${QT_BASE_DIR}/${QT_VERSION}/${QT_ARCH_DIR}${BUILD_ARCGIS:+;/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk};/usr/local" diff --git a/rti_license.dat b/rti_license.dat new file mode 100644 index 000000000..1caa9168c --- /dev/null +++ b/rti_license.dat @@ -0,0 +1,10 @@ +#----------------------------------------------------------------- +# Issued to: Test on Wed Sep 23 17:48:43 2026 +# Contact: Moi Meme Phone: ... +# email: berrux@outlook.de +# Do NOT edit this file. +SERVER ffffffff 1700 +FEATURE RTIPRO RTI 4. 20-nov-2026 0 F8031B976E72D17E8B03 "License=Evaluation;Company=Test;Contact=Moi Meme;Email=berrux@outlook.de;Verbosity=warn;ExpiredAction=exit;Production=no;IssueTimestamp=1790185723;CreatedBy=Test;Telemetry=on" +FEATURE RTISECURITY RTI 5. 20-nov-2026 0 B6F179F2381FC5CAE4DF "License=Evaluation;Company=Test;Contact=Moi Meme;Email=berrux@outlook.de;Verbosity=warn;ExpiredAction=exit;Production=no;IssueTimestamp=1790185723;CreatedBy=Test;Telemetry=on" +FEATURE RTIRWT RTI 6. 20-nov-2026 0 EE2FBD16BE636F7CAD9E "License=Evaluation;Company=Test;Contact=Moi Meme;Email=berrux@outlook.de;Verbosity=warn;ExpiredAction=exit;Production=no;IssueTimestamp=1790185723;CreatedBy=Test;Telemetry=on" +FEATURE RTICDS RTI 6. 20-nov-2026 0 15B75FC1054D5E39A55D "License=Evaluation;Company=Test;Contact=Moi Meme;Email=berrux@outlook.de;Verbosity=warn;ExpiredAction=exit;Production=no;IssueTimestamp=1790185723;CreatedBy=Test;Telemetry=on"