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,95 @@
|
||||
#
|
||||
# spec file for package OpenSceneGraph (Version 3.1.7)
|
||||
# $Revision$
|
||||
# $Date$
|
||||
# $Id$
|
||||
#
|
||||
|
||||
%define real_name NGS_guez_fom
|
||||
|
||||
Name: NGS_guez_fom
|
||||
Provides: %{name}
|
||||
|
||||
Requires: ace
|
||||
Requires: NGS
|
||||
Requires: ScoreConfiguration
|
||||
Requires: ScoreGeometry
|
||||
Requires: ScoreGeodesy
|
||||
Requires: tao
|
||||
|
||||
BuildRequires: ace-devel
|
||||
BuildRequires: NGS-devel
|
||||
BuildRequires: cmake
|
||||
BuildRequires: ScoreConfiguration-devel
|
||||
BuildRequires: ScoreGeometry-devel
|
||||
BuildRequires: ScoreGeodesy-devel
|
||||
BuildRequires: tao-devel
|
||||
License: commercial
|
||||
Group: System/Libraries
|
||||
Summary: NGS GUEZ FOM
|
||||
Version: 14.3.1
|
||||
Release: 1
|
||||
Source: %{name}-v%{version}.tgz
|
||||
AutoReqProv: no
|
||||
|
||||
%debug_package
|
||||
|
||||
%description
|
||||
NGS - Middleware for HLA, FOM parts
|
||||
|
||||
%package devel
|
||||
Provides: %{name}-devel
|
||||
Requires: %{name}
|
||||
Requires: NGS-devel
|
||||
License: commercial
|
||||
Group: Development/Libraries
|
||||
Summary: NGS GUEZ FOM
|
||||
|
||||
%description devel
|
||||
NGS - Middleware for HLA - devel package
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-v%{version}
|
||||
|
||||
%build
|
||||
export LD_LIBRARY_PATH=/opt/NGS/NGSPublic/lib:/opt/NGS/NGSPublic/lib/CorbaNotifyAny
|
||||
builddir=%{_builddir}/%{buildsubdir}-build
|
||||
rm -rf ${builddir}
|
||||
mkdir -p ${builddir}
|
||||
cd ${builddir}
|
||||
cp %{_builddir}/%{buildsubdir}/load.cmake .
|
||||
cmake -Wno-dev \
|
||||
-C load.cmake \
|
||||
-DCMAKE_INSTALL_PREFIX=${builddir}/NGSPublic \
|
||||
-DNGS_Public=/opt/NGS/NGSPublic \
|
||||
-DFOM_XMLFILE=%{_builddir}/%{buildsubdir}/RPRFOM2010_guez.xml \
|
||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||
/opt/NGS/NGSPublic/templates/ngs/NGSBuild/NGSSWFOM
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
builddir=%{_builddir}/%{buildsubdir}-build
|
||||
cd ${builddir}
|
||||
mkdir -p %{buildroot}/opt/NGS/
|
||||
cp -r ${builddir}/NGSPublic %{buildroot}/opt/NGS/
|
||||
|
||||
%clean
|
||||
%{__rm} -rf '%{buildroot}'
|
||||
%{__rm} -rf '%{_builddir}/%{buildsubdir}'
|
||||
%{__rm} -rf '%{_builddir}/%{buildsubdir}-build'
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,755)
|
||||
/opt/NGS/NGSPublic/dat
|
||||
/opt/NGS/NGSPublic/env
|
||||
/opt/NGS/NGSPublic/exe
|
||||
/opt/NGS/NGSPublic/lib
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,755)
|
||||
/opt/NGS/NGSPublic/doc
|
||||
/opt/NGS/NGSPublic/include
|
||||
|
||||
%changelog
|
||||
* Tue Mar 12 2019 Christian Ehrlicher
|
||||
- initial version v14.1.1
|
||||
Reference in new issue
Block a user