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,61 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* main for VulnerabilityStateGenerator
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Hannes Baeuerle, SLSE, 2016-08-09
|
||||
*/
|
||||
|
||||
#include <QtNetwork/QHostAddress>
|
||||
#include <QtNetwork/QNetworkInterface>
|
||||
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include "main_handler.h"
|
||||
|
||||
class CmdLineParser : public LtsCommandLineParser::LtsCommandLineParser
|
||||
{
|
||||
public:
|
||||
CmdLineParser()
|
||||
: LtsCommandLineParser()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
NGLCoreApplication app(argc, argv);
|
||||
CmdLineParser options;
|
||||
|
||||
if (!options.init())
|
||||
return -1;
|
||||
|
||||
// Check alle 30 Sekunden
|
||||
app.createLogger("VSG ", "log4cxx_vsg.props");
|
||||
VulnerabilityStateGenerator::MainHandler mainHandler;
|
||||
|
||||
NGL::INGLLogger &logger = app.logger("main");
|
||||
|
||||
int iRet = -1;
|
||||
if (!mainHandler.init(options.domainId(), options.exerciseId()))
|
||||
{
|
||||
ERROR_LOG(logger) << "Could not init MainHandler\n"
|
||||
<< "Please make shure, that the following procs are running:\n"
|
||||
<< "svcParticipantManagement -d " << options.domainId() << " -e 0\n"
|
||||
<< "svcParticipantManagement -d " << options.domainId() << " -e " << options.exerciseId() << "\n"
|
||||
<< "... shutting down";
|
||||
return iRet;
|
||||
}
|
||||
|
||||
STARTUP_LOG(logger);
|
||||
|
||||
iRet = app.exec();
|
||||
|
||||
SHUTDOWN_LOG(logger);
|
||||
|
||||
return iRet;
|
||||
}
|
||||
Reference in new issue
Block a user