torstenandCopilot
7173785915
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>
38 lines
945 B
Python
Executable File
38 lines
945 B
Python
Executable File
#!/usr/bin/python
|
|
# -*- coding: utf-8 -*-
|
|
#
|
|
# $Revision$
|
|
# $Date$
|
|
# $Id$
|
|
#
|
|
# Simple script to modify compile_commands.json
|
|
# -> remove generated files (except ours)
|
|
#
|
|
import json
|
|
import sys
|
|
|
|
if len(sys.argv) != 2:
|
|
print >> sys.stderr, "Usage: %s compile_commands.json" % sys.argv[0]
|
|
sys.exit(1)
|
|
|
|
try:
|
|
f = open(sys.argv[1], "r")
|
|
dataOut = []
|
|
for command in json.load(f):
|
|
fn = command['file']
|
|
# ignore build dir
|
|
if 'build/' in fn or '-build-' in fn:
|
|
# whilelist some file
|
|
if not '_impl' in fn and not fn.endswith('_plugin.cpp'):
|
|
continue
|
|
if '/moc_' in fn:
|
|
continue
|
|
|
|
command['command'] = command['command'].replace('''\\\"''', '''\"''')
|
|
dataOut.append(command)
|
|
|
|
f = open(sys.argv[1], "w")
|
|
json.dump(dataOut, f)
|
|
except Exception as e:
|
|
print >> sys.stderr, "Error modifying file '%s': %s" % (sys.argv[1], e)
|