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>
48 lines
1.1 KiB
Python
Executable File
48 lines
1.1 KiB
Python
Executable File
#!/usr/bin/python
|
|
# -*- coding: utf-8 -*-
|
|
#
|
|
# $Revision$
|
|
# $Date$
|
|
# $Id$
|
|
|
|
import os
|
|
import sys
|
|
import datetime
|
|
|
|
|
|
def main():
|
|
if len(sys.argv) < 3:
|
|
print >> sys.stderr, "Usage: %s <directory with pri-files> <pro-file> <ignored targets>" % sys.argv[0]
|
|
sys.exit(1)
|
|
|
|
path = sys.argv[1]
|
|
out = sys.argv[2]
|
|
# print "args: %s" % sys.argv[4:]
|
|
if not os.path.isdir(path):
|
|
print >> sys.stderr, "%s is not a directory" % path
|
|
sys.exit(2)
|
|
|
|
ignored_tgts = []
|
|
for ignored in sys.argv[4:]:
|
|
ignored_tgts.append(ignored)
|
|
|
|
tsfiles = []
|
|
dirList = os.listdir(path)
|
|
for fname in dirList:
|
|
if not fname.endswith(".pri"):
|
|
continue
|
|
if fname in ignored_tgts:
|
|
continue
|
|
tsfiles.append(fname)
|
|
|
|
with open(out, "w") as outfile:
|
|
now = datetime.datetime.now()
|
|
print >> outfile, '#'
|
|
print >> outfile, '# generated by %s at %s' % ( sys.argv[0], now.strftime("%Y-%m-%d %H:%M:%S") )
|
|
print >> outfile, '#'
|
|
for tsfile in sorted(tsfiles):
|
|
print >> outfile, 'include("%s")' % tsfile
|
|
|
|
if __name__ == "__main__":
|
|
main()
|