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
+89
@@ -0,0 +1,89 @@
|
||||
# $Id$
|
||||
# $HeadURL$
|
||||
#
|
||||
# Von Hand auszufuellen - Version und Release anpassen!
|
||||
# rpmbuild -bb --target=noarch guez_situation_map.spec
|
||||
#
|
||||
|
||||
Summary: Situation Map
|
||||
Name: lynxhu_situation_map
|
||||
Version: 1
|
||||
Release: 6
|
||||
License: proprietary
|
||||
Group: Applications/Resources
|
||||
Source: XXX
|
||||
Prefix: /
|
||||
Vendor: Rheinmetall Electronics GmbH
|
||||
URL: http://www.rheinmetall-defence.com
|
||||
Packager: ctc
|
||||
Provides: lynxhu_situation_map
|
||||
AutoReqProv: no
|
||||
|
||||
|
||||
##############################################################################
|
||||
# ESRI ArcGIS
|
||||
|
||||
Requires: ctc_arcgis >= 100.4.0-1
|
||||
Obsoletes: ctc_arcgis_testFix
|
||||
|
||||
##############################################################################
|
||||
# RME SituationMap
|
||||
|
||||
#Requires: ctc_arcgis_map_topographic
|
||||
#Requires: guez_arcgis_elevation_map_letzlingen >= 1.2.0-1
|
||||
#Requires: guez_arcgis_bldgs >= 1.5.0-1
|
||||
#Requires: guez_arcgis_3Dmodels
|
||||
|
||||
#Obsoletes: ctc_arcgis_app6b
|
||||
#Obsoletes: ctc_arcgis_local_server
|
||||
#Obsoletes: ctc_arcgis_viewshed_gpk
|
||||
|
||||
|
||||
|
||||
%description
|
||||
Meta rpm for Situation Map (GUEZ)
|
||||
|
||||
##############################################################################
|
||||
# ESRI ArcGIS - Development
|
||||
|
||||
%package devel
|
||||
Summary: Situation Map - Development
|
||||
Provides: lynxhu_situation_map-devel
|
||||
|
||||
Requires: ctc_arcgis-devel >= 100.4.0-1
|
||||
|
||||
%description devel
|
||||
Meta rpm for Situation Map (GUEZ) - Development
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
|
||||
|
||||
##############################################################################
|
||||
%changelog
|
||||
#* date +"%a %b %d %Y" text
|
||||
* Wed Apr 24 2024 Patric Karwat
|
||||
- initial
|
||||
|
||||
%prep
|
||||
#echo "nothing to do"
|
||||
echo "prep done"
|
||||
|
||||
%build
|
||||
echo "nothing to build"
|
||||
# nothing to do here
|
||||
|
||||
%install
|
||||
echo "nothing to install"
|
||||
# nothing to do here
|
||||
|
||||
%clean
|
||||
%__rm -rf "%{buildroot}"
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
|
||||
%pre
|
||||
%post
|
||||
%preun
|
||||
%postun
|
||||
Reference in new issue
Block a user