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,70 @@
|
||||
import json
|
||||
import os.path
|
||||
import subprocess
|
||||
|
||||
|
||||
def save_settings(settings, root_pass):
|
||||
settings_dir = "/etc/excon_helper"
|
||||
settings_file = os.path.join(settings_dir, ".settings.json")
|
||||
temp_file = "/tmp/.settings.json" # Temporäre Datei
|
||||
|
||||
# Temporäre Datei lokal schreiben
|
||||
with open(temp_file, "w") as temp:
|
||||
json.dump(settings, temp, indent=4)
|
||||
|
||||
# Befehle zum Erstellen des Zielverzeichnisses und Kopieren der Datei
|
||||
commands = [
|
||||
f"mkdir -p {settings_dir}",
|
||||
f"cp {temp_file} {settings_file}",
|
||||
f"chmod 777 {settings_file}",
|
||||
f"rm {temp_file}" # Temporäre Datei entfernen
|
||||
]
|
||||
|
||||
for command in commands:
|
||||
try:
|
||||
# Übergebe das Passwort an `sudo` und führe den Befehl aus
|
||||
process = subprocess.run(
|
||||
f"echo {root_pass} | sudo -S {command}",
|
||||
shell=True
|
||||
)
|
||||
if process.returncode != 0:
|
||||
print(f"Cant save settings file")
|
||||
return False
|
||||
except Exception as e:
|
||||
print(f"Error: {e}")
|
||||
return False
|
||||
|
||||
return True
|
||||
|
||||
def load_settings():
|
||||
settings_file = "/etc/excon_helper/.settings.json"
|
||||
|
||||
# Überprüfen, ob die Datei existiert
|
||||
if not os.path.exists(settings_file):
|
||||
print(f"Error: Settings file doesnt exist")
|
||||
return {}
|
||||
|
||||
# Lesen der JSON-Datei
|
||||
try:
|
||||
with open(settings_file, "r") as file:
|
||||
settings = json.load(file)
|
||||
return settings
|
||||
except json.JSONDecodeError:
|
||||
print("Error: Corrupted json file")
|
||||
except PermissionError:
|
||||
print("Error: no permission to read the file")
|
||||
except Exception as e:
|
||||
print(f"Unknown error: {e}")
|
||||
|
||||
return {}
|
||||
|
||||
def get_setting(key):
|
||||
settings = load_settings()
|
||||
if settings is not None:
|
||||
return settings.get(key)
|
||||
return None
|
||||
|
||||
def set_setting(key, value):
|
||||
settings = load_settings()
|
||||
settings.set(key, value)
|
||||
save_settings(settings)
|
||||
Reference in new issue
Block a user