Qt6 Migration: Complete migration with DDS/RTI support and build validation
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
@@ -0,0 +1,11 @@
|
||||
#
|
||||
# $Id$
|
||||
# $HeadURL$
|
||||
# $Author$
|
||||
#
|
||||
|
||||
# FILE ctc_check_situation_map.sh
|
||||
configure_file(ctc_check_situation_map.sh ${CMAKE_BINARY_DIR}/admin_scripts/ctc_check_situation_map.sh COPYONLY USE_SOURCE_PERMISSIONS)
|
||||
NGL_INSTALL(WS FILES ctc_check_situation_map.sh DESTINATION ./admin_scripts)
|
||||
NGL_INSTALL(WS FILES ctc_operator_app_removal_tool.sh DESTINATION ./admin_scripts)
|
||||
|
||||
+83
@@ -0,0 +1,83 @@
|
||||
#!/bin/bash
|
||||
# Helper script to check presence of some rpms
|
||||
# $Id$
|
||||
# $HeadURL$
|
||||
# $Author$
|
||||
|
||||
|
||||
RPMS=""
|
||||
|
||||
# Stand 2022/09:
|
||||
|
||||
# Bremen
|
||||
RPMS="${RPMS} ctc_arcgis-100.8"
|
||||
RPMS="${RPMS} legatus_basemap_bremen_osm_32632"
|
||||
RPMS="${RPMS} legatus_basemap_bremen_osm_WebMerc"
|
||||
RPMS="${RPMS} legatus_basemap_bremen_hemelingen_aerial_32632"
|
||||
RPMS="${RPMS} legatus_basemap_bremen_hemelingen_aerial_WebMerc"
|
||||
RPMS="${RPMS} ctc_arcgis_elevation_map_bremen"
|
||||
RPMS="${RPMS} ctc_arcgis_BT_56"
|
||||
|
||||
# GUEZ
|
||||
RPMS="${RPMS} guez_basemap_topo2015_32632"
|
||||
RPMS="${RPMS} guez_basemap_topo2015_WebMerc"
|
||||
RPMS="${RPMS} guez_basemap_aerial2017_32632"
|
||||
RPMS="${RPMS} guez_basemap_aerial2017_WebMerc"
|
||||
RPMS="${RPMS} guez_basemap_schnoeggersburg_drone_32632"
|
||||
RPMS="${RPMS} guez_basemap_schnoeggersburg_drone_WebMerc"
|
||||
RPMS="${RPMS} guez_arcgis_elevation_map_letzlingen"
|
||||
RPMS="${RPMS} guez_arcgis_bldgs"
|
||||
RPMS="${RPMS} guez_arcgis_3Dmodels"
|
||||
|
||||
###RPMS="${RPMS} DoeNotExt"
|
||||
|
||||
|
||||
numOk=0;
|
||||
numFailure=0;
|
||||
|
||||
echo "---one moment please....";
|
||||
rpm -qa > /tmp/allRpms.txt
|
||||
|
||||
for RPM in ${RPMS}
|
||||
do
|
||||
#echo "------------------------------------";
|
||||
#echo " RPM = '$RPM' ";
|
||||
grep $RPM /tmp/allRpms.txt > /dev/null
|
||||
if [ $? -eq 0 ];
|
||||
then
|
||||
echo " RPM seems to be installed: '$RPM'";
|
||||
((numOk=numOk+1))
|
||||
else
|
||||
echo "-> missing -> RPM '$RPM' ";
|
||||
((numFailure=numFailure+1))
|
||||
fi
|
||||
done
|
||||
|
||||
echo "------------------------------------";
|
||||
echo " installed = $numOk ";
|
||||
echo " missing = $numFailure ";
|
||||
|
||||
# cleanup
|
||||
rm /tmp/allRpms.txt
|
||||
|
||||
|
||||
echo "------------------------------------";
|
||||
echo "------------------------------------";
|
||||
echo "------------------------------------";
|
||||
|
||||
echo "";
|
||||
read -p "Press [Enter] key to continue"
|
||||
echo "";
|
||||
|
||||
|
||||
echo "------------------------------------";
|
||||
zypper --repo RDE_15.0 se --details --installed-only ctc_
|
||||
zypper --repo RDE_15.0 se --details --installed-only legatus
|
||||
zypper --repo RDE_15.0 se --details --installed-only guez
|
||||
|
||||
echo "------------------------------------";
|
||||
zypper --repo RDE_15.0 se --not-installed-only ctc_
|
||||
zypper --repo RDE_15.0 se --not-installed-only legatus
|
||||
zypper --repo RDE_15.0 se --not-installed-only guez
|
||||
|
||||
|
||||
+29
@@ -0,0 +1,29 @@
|
||||
#!/bin/bash
|
||||
# Helper script to check presence of some rpms
|
||||
# $Id$
|
||||
# $HeadURL$
|
||||
# $Author$
|
||||
|
||||
|
||||
# Stand 2024
|
||||
|
||||
|
||||
echo "--- part 1";
|
||||
|
||||
# suche alle cpp file, mit 'getLogger'
|
||||
#find . -iname "*.cpp" | xargs grep getLogger
|
||||
|
||||
# ersetze a) getLogger durch @ b) entferne " c) entferne ) | nur das rechts vom @
|
||||
#find . -iname "*.cpp" | xargs grep getLogger | sed -e 's/getLogger(/@/g' -e 's/\"//g' -e 's/)//g' | cut -d "@" -f2
|
||||
|
||||
# sortiere und entferne doppelte:
|
||||
#find . -iname "*.cpp" | xargs grep getLogger | sed -e 's/getLogger(/@/g' -e 's/\"//g' -e 's/)//g' | cut -d "@" -f2 | sort -u
|
||||
|
||||
# prepend
|
||||
find . -iname "*.cpp" | xargs grep getLogger | sed -e 's/getLogger(/@/g' -e 's/\"//g' -e 's/)//g' | cut -d "@" -f2 | sort -u | awk '{print "#log4j.logger.AES." $0 "=DEBUG"}'
|
||||
|
||||
|
||||
echo "--- part 2";
|
||||
|
||||
find . -iname "*.cpp" | xargs grep ": BaseEdit" | sed -e 's/QLatin1String(/@/g' -e 's/QStringLiteral(/@/g' -e 's/\")/@/g' -e 's/\"//g' | cut -d "@" -f2 | sort -u | awk '{print "#log4j.logger.AES." $0 "=DEBUG"}'
|
||||
|
||||
+18
@@ -0,0 +1,18 @@
|
||||
#!/bin/bash
|
||||
# Helper script to cleanup (temporary) files
|
||||
# $Id$
|
||||
# $HeadURL$
|
||||
# $Author$
|
||||
|
||||
|
||||
# Stand 2023/06:
|
||||
|
||||
#
|
||||
# cleanup (temporary) files
|
||||
#
|
||||
# Buildingviewer:
|
||||
# problems may arise due to different users crating the dir/files...
|
||||
echo "------------------------------------";
|
||||
echo "cleanup /tmp/excon_bgviewer_symbols";
|
||||
rm -rf /tmp/excon_bgviewer_symbols
|
||||
|
||||
Reference in new issue
Block a user