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,93 @@
|
||||
# $Id$
|
||||
# $HeadURL$
|
||||
#
|
||||
# Von Hand auszufuellen - Version und Release anpassen!
|
||||
# rpmbuild -bb --target=noarch l400p2_situation_map.spec
|
||||
#
|
||||
|
||||
Summary: Situation Map
|
||||
Name: l400p2_situation_map
|
||||
Version: 1
|
||||
Release: 5
|
||||
License: proprietary
|
||||
Group: Applications/Resources
|
||||
Source: XXX
|
||||
Prefix: /
|
||||
Vendor: Rheinmetall Electronics GmbH
|
||||
URL: http://www.rheinmetall-defence.com
|
||||
Packager: ctc
|
||||
Provides: l400_situation_map
|
||||
AutoReqProv: no
|
||||
|
||||
|
||||
##############################################################################
|
||||
# ESRI ArcGIS
|
||||
|
||||
Requires: ctc_arcgis >= 100.7.0-0
|
||||
|
||||
|
||||
##############################################################################
|
||||
# RME SituationMap
|
||||
|
||||
Requires: ctc_arcgis_map_topographic
|
||||
Requires: l400p2_arcgis_elevation_maps >= 1-0
|
||||
Requires: l400p2_basemap_cultana_aerial_32653
|
||||
Requires: l400p2_basemap_puckapunyal_aerial_32655
|
||||
Requires: l400p2_basemap_swbta_aerial_32656
|
||||
Requires: l400p2_basemap_tfta_aerial_32655
|
||||
|
||||
Obsoletes: ctc_arcgis_app6b
|
||||
Obsoletes: ctc_arcgis_local_server
|
||||
Obsoletes: ctc_arcgis_viewshed_gpk
|
||||
|
||||
|
||||
|
||||
%description
|
||||
Meta rpm for Situation Map (L400)
|
||||
|
||||
##############################################################################
|
||||
# ESRI ArcGIS - Development
|
||||
|
||||
%package devel
|
||||
Summary: Situation Map - Development
|
||||
Provides: l400_situation_map-devel
|
||||
|
||||
Requires: ctc_arcgis-devel >= 100.7.0-0
|
||||
|
||||
%description devel
|
||||
Meta rpm for Situation Map (L400) - Development
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
|
||||
|
||||
##############################################################################
|
||||
%changelog
|
||||
#* date +"%a %b %d %Y" text
|
||||
* Thu Jun 17 2021 Norbert Thoden
|
||||
- fix dependency to l400p2_arcgis_elevation_maps
|
||||
* Mon Feb 24 2020 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
|
||||
+64
@@ -0,0 +1,64 @@
|
||||
# $Id$
|
||||
# $HeadURL$
|
||||
#
|
||||
# Von Hand auszufuellen - Version und Release anpassen!
|
||||
# rpmbuild -bb --target=noarch l400p2_arcgis_elevation_maps.spec
|
||||
#
|
||||
|
||||
%define ctc_name l400p2_arcgis_elevation_maps
|
||||
|
||||
%define dest_path /usr/share/arcgis/resources/elevation
|
||||
|
||||
Summary: Elevation maps, region Australia (Cultana, Puckapunyal, TFTA, SWBTA)
|
||||
Name: %{ctc_name}
|
||||
Version: 1
|
||||
Release: 0
|
||||
License: proprietary
|
||||
Group: Applications/Resources
|
||||
Source: %{ctc_name}-release-%{version}.tar.gz
|
||||
Prefix: /
|
||||
Vendor: Rheinmetall Electronics GmbH
|
||||
URL: http://www.rheinmetall-defence.com
|
||||
Packager: ctc
|
||||
Provides: %{ctc_name}
|
||||
AutoReqProv: no
|
||||
|
||||
%description
|
||||
ArcGIS Package for the elevation map, region Australia (Cultana, Puckapunyal, TFTA, SWBTA)
|
||||
|
||||
|
||||
%changelog
|
||||
#* date +"%a %b %d %Y" text
|
||||
* Tue Mar 10 2020 Norbert Thoden
|
||||
- initial
|
||||
|
||||
%prep
|
||||
# skip setup/tgz to save space and time
|
||||
%setup -q -n %{ctc_name}-release-%{version}
|
||||
echo "prep done"
|
||||
|
||||
%build
|
||||
echo "nothing to build"
|
||||
# nothing to do here
|
||||
|
||||
%install
|
||||
mkdir -p "%{buildroot}/%{dest_path}"
|
||||
cp -r %{_builddir}/%{buildsubdir}/usr/share/arcgis/resources/elevation/L400 %{buildroot}/%{dest_path}
|
||||
|
||||
|
||||
%clean
|
||||
%__rm -rf "%{buildroot}"
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%{dest_path}/L400/Cultana_e137s33_TFRM.dt2
|
||||
%{dest_path}/L400/2020-03-03_Puckapunyal.tif
|
||||
%{dest_path}/L400/SWBTA_e150s23_TFRM.dt2
|
||||
%{dest_path}/L400/TFTA_e146s20_TFRM.dt2
|
||||
|
||||
%pre
|
||||
%post
|
||||
%preun
|
||||
%postun
|
||||
|
||||
|
||||
+60
@@ -0,0 +1,60 @@
|
||||
# $Id$
|
||||
# $HeadURL$
|
||||
#
|
||||
# Von Hand auszufuellen - Version und Release anpassen!
|
||||
# rpmbuild -bb --target=noarch l400p2_basemap_cultana_aerial_32653.spec
|
||||
#
|
||||
|
||||
%define ctc_name l400p2_basemap_cultana_aerial_32653
|
||||
|
||||
%define dest_path /usr/share/arcgis/resources/TilePackage/L400
|
||||
%define file_name 2020-03-02_Cultana_aerial_0m50_32653.tpk
|
||||
|
||||
Summary: ArcGIS Maps (L400)
|
||||
Name: %{ctc_name}
|
||||
Version: 1
|
||||
Release: 0
|
||||
License: proprietary
|
||||
Group: Applications/Resources
|
||||
Source: %{ctc_name}-release-%{version}.tar.gz
|
||||
Prefix: /
|
||||
Vendor: Rheinmetall Electronics GmbH
|
||||
URL: http://www.rheinmetall-defence.com
|
||||
Packager: ctc
|
||||
Provides: %{ctc_name}
|
||||
AutoReqProv: no
|
||||
|
||||
%description
|
||||
L400 local (basemap 2020-03-02_Cultana_aerial_0m50_32653.tpk)
|
||||
|
||||
%changelog
|
||||
#* date +"%a %b %d %Y" text
|
||||
* Thu Mar 05 2020 Norbert Thoden
|
||||
- initial
|
||||
|
||||
%prep
|
||||
# skip setup/tgz to save space and time
|
||||
%setup -q -n %{ctc_name}-release-%{version}
|
||||
echo "prep done"
|
||||
|
||||
%build
|
||||
echo "nothing to build"
|
||||
# nothing to do here
|
||||
|
||||
%install
|
||||
mkdir -p "%{buildroot}/%{dest_path}"
|
||||
cp -r %{_builddir}/%{buildsubdir}/resources/TilePackage/L400/%{file_name} %{buildroot}/%{dest_path}
|
||||
|
||||
%clean
|
||||
%__rm -rf "%{buildroot}"
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%{dest_path}/%{file_name}
|
||||
|
||||
%pre
|
||||
%post
|
||||
%preun
|
||||
%postun
|
||||
|
||||
|
||||
Vendored
+61
@@ -0,0 +1,61 @@
|
||||
# $Id$
|
||||
# $HeadURL$
|
||||
#
|
||||
# Von Hand auszufuellen - Version und Release anpassen!
|
||||
# rpmbuild -bb --target=noarch l400p2_basemap_puckapunyal_aerial_32655.spec
|
||||
|
||||
#
|
||||
|
||||
%define ctc_name l400p2_basemap_puckapunyal_aerial_32655
|
||||
|
||||
%define dest_path /usr/share/arcgis/resources/TilePackage/L400
|
||||
%define file_name 2020-03-02_Puckapunyal_aerial_0m20_32655.tpk
|
||||
|
||||
Summary: ArcGIS Maps (L400)
|
||||
Name: %{ctc_name}
|
||||
Version: 1
|
||||
Release: 0
|
||||
License: proprietary
|
||||
Group: Applications/Resources
|
||||
Source: %{ctc_name}-release-%{version}.tar.gz
|
||||
Prefix: /
|
||||
Vendor: Rheinmetall Electronics GmbH
|
||||
URL: http://www.rheinmetall-defence.com
|
||||
Packager: ctc
|
||||
Provides: %{ctc_name}
|
||||
AutoReqProv: no
|
||||
|
||||
%description
|
||||
L400 local (basemap 2020-03-02_Puckapunyal_aerial_0m20_32655.tpk)
|
||||
|
||||
%changelog
|
||||
#* date +"%a %b %d %Y" text
|
||||
* Thu Mar 05 2020 Norbert Thoden
|
||||
- initial
|
||||
|
||||
%prep
|
||||
# skip setup/tgz to save space and time
|
||||
%setup -q -n %{ctc_name}-release-%{version}
|
||||
echo "prep done"
|
||||
|
||||
%build
|
||||
echo "nothing to build"
|
||||
# nothing to do here
|
||||
|
||||
%install
|
||||
mkdir -p "%{buildroot}/%{dest_path}"
|
||||
cp -r %{_builddir}/%{buildsubdir}/resources/TilePackage/L400/%{file_name} %{buildroot}/%{dest_path}
|
||||
|
||||
%clean
|
||||
%__rm -rf "%{buildroot}"
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%{dest_path}/%{file_name}
|
||||
|
||||
%pre
|
||||
%post
|
||||
%preun
|
||||
%postun
|
||||
|
||||
|
||||
+60
@@ -0,0 +1,60 @@
|
||||
# $Id$
|
||||
# $HeadURL$
|
||||
#
|
||||
# Von Hand auszufuellen - Version und Release anpassen!
|
||||
# rpmbuild -bb --target=noarch l400p2_basemap_swbta_aerial_32656.spec
|
||||
#
|
||||
|
||||
%define ctc_name l400p2_basemap_swbta_aerial_32656
|
||||
|
||||
%define dest_path /usr/share/arcgis/resources/TilePackage/L400
|
||||
%define file_name 2020-03-02_SWBTA_aerial_0m20_32656.tpk
|
||||
|
||||
Summary: ArcGIS Maps (L400)
|
||||
Name: %{ctc_name}
|
||||
Version: 1
|
||||
Release: 0
|
||||
License: proprietary
|
||||
Group: Applications/Resources
|
||||
Source: %{ctc_name}-release-%{version}.tar.gz
|
||||
Prefix: /
|
||||
Vendor: Rheinmetall Electronics GmbH
|
||||
URL: http://www.rheinmetall-defence.com
|
||||
Packager: ctc
|
||||
Provides: %{ctc_name}
|
||||
AutoReqProv: no
|
||||
|
||||
%description
|
||||
L400 local (basemap 2020-03-02_Cultana_aerial_0m50_32653.tpk)
|
||||
|
||||
%changelog
|
||||
#* date +"%a %b %d %Y" text
|
||||
* Thu Mar 05 2020 Norbert Thoden
|
||||
- initial
|
||||
|
||||
%prep
|
||||
# skip setup/tgz to save space and time
|
||||
%setup -q -n %{ctc_name}-release-%{version}
|
||||
echo "prep done"
|
||||
|
||||
%build
|
||||
echo "nothing to build"
|
||||
# nothing to do here
|
||||
|
||||
%install
|
||||
mkdir -p "%{buildroot}/%{dest_path}"
|
||||
cp -r %{_builddir}/%{buildsubdir}/resources/TilePackage/L400/%{file_name} %{buildroot}/%{dest_path}
|
||||
|
||||
%clean
|
||||
%__rm -rf "%{buildroot}"
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%{dest_path}/%{file_name}
|
||||
|
||||
%pre
|
||||
%post
|
||||
%preun
|
||||
%postun
|
||||
|
||||
|
||||
+60
@@ -0,0 +1,60 @@
|
||||
# $Id$
|
||||
# $HeadURL$
|
||||
#
|
||||
# Von Hand auszufuellen - Version und Release anpassen!
|
||||
# rpmbuild -bb --target=noarch l400p2_basemap_tfta_aerial_32655.spec
|
||||
#
|
||||
|
||||
%define ctc_name l400p2_basemap_tfta_aerial_32655
|
||||
|
||||
%define dest_path /usr/share/arcgis/resources/TilePackage/L400
|
||||
%define file_name 2020-03-02_TFTA_aerial_0m50_32655.tpk
|
||||
|
||||
Summary: ArcGIS Maps (L400)
|
||||
Name: %{ctc_name}
|
||||
Version: 1
|
||||
Release: 0
|
||||
License: proprietary
|
||||
Group: Applications/Resources
|
||||
Source: %{ctc_name}-release-%{version}.tar.gz
|
||||
Prefix: /
|
||||
Vendor: Rheinmetall Electronics GmbH
|
||||
URL: http://www.rheinmetall-defence.com
|
||||
Packager: ctc
|
||||
Provides: %{ctc_name}
|
||||
AutoReqProv: no
|
||||
|
||||
%description
|
||||
L400 local (basemap 2020-03-02_TFTA_aerial_0m50_32655.tpk)
|
||||
|
||||
%changelog
|
||||
#* date +"%a %b %d %Y" text
|
||||
* Thu Mar 05 2020 Norbert Thoden
|
||||
- initial
|
||||
|
||||
%prep
|
||||
# skip setup/tgz to save space and time
|
||||
%setup -q -n %{ctc_name}-release-%{version}
|
||||
echo "prep done"
|
||||
|
||||
%build
|
||||
echo "nothing to build"
|
||||
# nothing to do here
|
||||
|
||||
%install
|
||||
mkdir -p "%{buildroot}/%{dest_path}"
|
||||
cp -r %{_builddir}/%{buildsubdir}/resources/TilePackage/L400/%{file_name} %{buildroot}/%{dest_path}
|
||||
|
||||
%clean
|
||||
%__rm -rf "%{buildroot}"
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%{dest_path}/%{file_name}
|
||||
|
||||
%pre
|
||||
%post
|
||||
%preun
|
||||
%postun
|
||||
|
||||
|
||||
@@ -0,0 +1,93 @@
|
||||
# $Id$
|
||||
# $HeadURL$
|
||||
#
|
||||
# Von Hand auszufuellen - Version und Release anpassen!
|
||||
# rpmbuild -bb --target=noarch l400p2_situation_map.spec
|
||||
#
|
||||
|
||||
Summary: Situation Map
|
||||
Name: l400p2_situation_map
|
||||
Version: 1
|
||||
Release: 5
|
||||
License: proprietary
|
||||
Group: Applications/Resources
|
||||
Source: XXX
|
||||
Prefix: /
|
||||
Vendor: Rheinmetall Electronics GmbH
|
||||
URL: http://www.rheinmetall-defence.com
|
||||
Packager: ctc
|
||||
Provides: l400p2_situation_map
|
||||
AutoReqProv: no
|
||||
|
||||
|
||||
##############################################################################
|
||||
# ESRI ArcGIS
|
||||
|
||||
Requires: ctc_arcgis >= 100.7.0-0
|
||||
|
||||
|
||||
##############################################################################
|
||||
# RME SituationMap
|
||||
|
||||
Requires: ctc_arcgis_map_topographic
|
||||
Requires: l400p2_arcgis_elevation_maps >= 1-0
|
||||
Requires: l400p2_basemap_cultana_aerial_32653
|
||||
Requires: l400p2_basemap_puckapunyal_aerial_32655
|
||||
Requires: l400p2_basemap_swbta_aerial_32656
|
||||
Requires: l400p2_basemap_tfta_aerial_32655
|
||||
|
||||
Obsoletes: ctc_arcgis_app6b
|
||||
Obsoletes: ctc_arcgis_local_server
|
||||
Obsoletes: ctc_arcgis_viewshed_gpk
|
||||
|
||||
|
||||
|
||||
%description
|
||||
Meta rpm for Situation Map (L400)
|
||||
|
||||
##############################################################################
|
||||
# ESRI ArcGIS - Development
|
||||
|
||||
%package devel
|
||||
Summary: Situation Map - Development
|
||||
Provides: l400p2_situation_map-devel
|
||||
|
||||
Requires: ctc_arcgis-devel >= 100.7.0-0
|
||||
|
||||
%description devel
|
||||
Meta rpm for Situation Map (L400p2) - Development
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
|
||||
|
||||
##############################################################################
|
||||
%changelog
|
||||
#* date +"%a %b %d %Y" text
|
||||
* Thu Jun 17 2021 Norbert Thoden
|
||||
- fix dependency to l400p2_arcgis_elevation_maps
|
||||
* Mon Feb 24 2020 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