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
Executable
+41
@@ -0,0 +1,41 @@
|
||||
#!/usr/bin/python
|
||||
# -*- coding: utf-8 -*-
|
||||
# $Id$
|
||||
# $HeadURL$
|
||||
# $Author$
|
||||
|
||||
import re,os,sys
|
||||
|
||||
rx1 = re.compile('(@RDE_HEADER@[ ]*\n[ \*]*)')
|
||||
rx2 = re.compile('(\\$Id: ([^ ]*) ([^ ]*).*)')
|
||||
rx3 = re.compile('.*\\$HeadURL:.*\n')
|
||||
rx4 = re.compile('(\\$Author: ([^ ]*).*)')
|
||||
|
||||
def replace_svn_keywords(filename):
|
||||
print "fixing %s" % filename
|
||||
input_file = open(filename, "r")
|
||||
output = input_file.read()
|
||||
input_file.close()
|
||||
|
||||
output = rx1.sub('\\\\brief ', output)
|
||||
output = rx2.sub('\\\\file \\2\n * \\\\version \\3', output)
|
||||
output = rx3.sub('', output)
|
||||
output = rx4.sub('\\\\author \\2', output)
|
||||
|
||||
output_file = open(filename, "w")
|
||||
output_file.write(output)
|
||||
output_file.close()
|
||||
|
||||
nargs = len(sys.argv)
|
||||
if nargs != 2 or not os.path.isdir(sys.argv[1]):
|
||||
print "usage: %s <src-dir>"
|
||||
sys.exit(1)
|
||||
|
||||
for path, subdirs, files in os.walk(sys.argv[1]):
|
||||
files.extend(subdirs)
|
||||
for name in files:
|
||||
if name.endswith('.c') or \
|
||||
name.endswith('.h') or \
|
||||
name.endswith('.cpp') or \
|
||||
name.endswith('.hpp'):
|
||||
replace_svn_keywords(os.path.join(path, name))
|
||||
Reference in new issue
Block a user