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>
68 lines
2.0 KiB
Python
Executable File
68 lines
2.0 KiB
Python
Executable File
#!/usr/bin/python
|
|
# coding: utf-8
|
|
#
|
|
|
|
import json
|
|
import os
|
|
import sys
|
|
|
|
def generate_compile_commands_from_json(infilename, outfilename, builddir = None):
|
|
try:
|
|
if os.path.isfile(outfilename):
|
|
os.remove(outfilename)
|
|
|
|
jsonFile = open(infilename,'r')
|
|
outFile = open(outfilename, 'w')
|
|
|
|
for command in json.load(jsonFile):
|
|
# blacklist build dir
|
|
if builddir:
|
|
fn = command['file']
|
|
if command['file'].startswith(builddir):
|
|
continue
|
|
# whilelist some generated files (generated by us) - is not useful since qacpp can't handle dds data types
|
|
#if not '_impl' in fn and not '_plugin.cpp' in fn:
|
|
# if 'moc_' in fn:
|
|
# continue
|
|
# not sure why \" must be replaced with \"" - but that's the output of the old script
|
|
# .acf file is not used, add some defines...
|
|
cmd = ' "' + command['command'].replace('-isystem ', '-I').replace('-isystem', '-I').replace('-I ', '-I').replace('\\\\\\','\\"').replace('\"', '\""') + ' "\n'
|
|
outFile.write(cmd)
|
|
|
|
return True
|
|
except Exception as e:
|
|
print >> sys.stderr, "Error generating compile commands file '%s': %s" % (outfilename, e)
|
|
return False
|
|
|
|
########### START --- CHECK FOR VALID OPTION AND PATH ###########
|
|
def main():
|
|
print sys.argv[1]
|
|
print sys.argv[2]
|
|
try:
|
|
usageOption = sys.argv[1]
|
|
except:
|
|
print ('''You forgot to add a OPTION
|
|
-path <path>
|
|
''')
|
|
sys.exit()
|
|
try:
|
|
path = sys.argv[2]
|
|
except:
|
|
print ('''You forgot to add a PATH
|
|
-path <path>
|
|
''')
|
|
sys.exit()
|
|
|
|
if ( usageOption == '-path'):
|
|
jsonOrigFile = os.path.abspath(path+'/compile_commands.json')
|
|
outfilename = os.path.abspath(path+'/compile_commands.txt')
|
|
if not os.path.isfile(jsonOrigFile):
|
|
print >> sys.stderr, "Could not find compile commands file %s... aborting" % jsonOrigFile
|
|
sys.exit(1)
|
|
generate_compile_commands_from_json(jsonOrigFile, outfilename)
|
|
|
|
########### END --- CHECK FOR VALID OPTION AND PATH ###########
|
|
|
|
if __name__ == "__main__":
|
|
main()
|