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,69 @@
|
||||
#!/usr/bin/python
|
||||
|
||||
import os
|
||||
import sys
|
||||
import shutil
|
||||
import fileinput
|
||||
|
||||
#######################
|
||||
###### FUNCTIONS ######
|
||||
#######################
|
||||
|
||||
def copyAndReplaceInFile(sourceFile, destinationFile, replacements):
|
||||
with open(sourceFile) as inFile, open(destinationFile, "w") as outFile:
|
||||
for line in inFile:
|
||||
for before, after in replacements.iteritems():
|
||||
line = line.replace(before, after)
|
||||
outFile.write(line)
|
||||
|
||||
##########################
|
||||
###### SCRIPT START ######
|
||||
##########################
|
||||
|
||||
longName = raw_input("Enter Plugin name (in CamelCase): ")
|
||||
shortNameAllLow = raw_input("Enter Plugin abbreviation (3 lower case letters): ")
|
||||
shortNameCapital = shortNameAllLow.capitalize()
|
||||
shortNameAllUpper = shortNameAllLow.upper()
|
||||
|
||||
#create new directory
|
||||
dirName = "../" + longName
|
||||
print "Trying to create Plugin directory \"" + dirName + "\""
|
||||
if os.path.isdir(dirName):
|
||||
print "Directory \"" + dirName + "\" already exists. Exit"
|
||||
sys.exit(-1)
|
||||
else:
|
||||
os.mkdir(dirName)
|
||||
print ".. done"
|
||||
|
||||
#create new files to new dir
|
||||
print "Creating new files"
|
||||
replacements = { "skl":shortNameAllLow, "Skl":shortNameCapital, "SKL":shortNameAllUpper, "Skeleton":longName }
|
||||
copyAndReplaceInFile("base/CMakeLists.txt", "../" + longName + "/CMakeLists.txt", replacements)
|
||||
copyAndReplaceInFile("base/skl_data_plugin_interface.h", "../" + longName + "/" + shortNameAllLow + "_data_plugin_interface.h", replacements)
|
||||
print ".. done"
|
||||
|
||||
#adding in CMakeLists.txt
|
||||
cmakeFileName = "../CMakeLists.txt"
|
||||
print "Trying to add directory in", cmakeFileName
|
||||
cmakeFileObject = open(cmakeFileName)
|
||||
lines = cmakeFileObject.readlines()
|
||||
cmakeFileObject.close
|
||||
index = 0
|
||||
hasAddedSubDir = False
|
||||
beforeLine = "placeholder"
|
||||
for line in lines:
|
||||
if beforeLine.startswith("ADD_SUBDIRECTORY") and not line.startswith("ADD_SUBDIRECTORY"):
|
||||
hasAddedSubDir = True
|
||||
break
|
||||
beforeLine = line
|
||||
index += 1
|
||||
if hasAddedSubDir == True:
|
||||
lines.insert(index, "ADD_SUBDIRECTORY(" + longName + ")\n")
|
||||
cmakeFileObject = open(cmakeFileName, "w")
|
||||
for line in lines:
|
||||
cmakeFileObject.write(line)
|
||||
cmakeFileObject.close()
|
||||
print ".. done"
|
||||
else:
|
||||
print "Could not add sub directory, please add \"ADD_SUBDIRECTORY(" + longName + ")\""
|
||||
print "manually to", cmakeFileName
|
||||
Reference in new issue
Block a user