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>
57 lines
1.4 KiB
C++
57 lines
1.4 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* main for HLA
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Christian Ehrlicher, SLSE, 2017-04-07
|
|
*/
|
|
|
|
#include <nglapplication/nglcoreapplication.h>
|
|
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
|
#include <memory>
|
|
#include "main_handler.h"
|
|
#include <Common/logger.h>
|
|
#include <Common/settings.h>
|
|
#include <NGSApplicationBase.h>
|
|
|
|
// Corba specific stuff
|
|
class myCorbaSpecificStuff final : public NGSApplicationBase
|
|
{
|
|
public:
|
|
using NGSApplicationBase::NGSApplicationBase;
|
|
int run() override { return 1; }
|
|
};
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
NGLCoreApplication app(argc, argv);
|
|
|
|
qputenv("RTI_ASSISTANT_DISABLE", QByteArray("1"));
|
|
qputenv("RTI_RID_FILE", QCoreApplication::applicationDirPath().append(QLatin1String("/rid.mtl")).toLocal8Bit());
|
|
|
|
int iRet = -1;
|
|
LtsCommandLineParser::LtsCommandLineParser options;
|
|
if (!options.init())
|
|
return iRet;
|
|
app.createLogger("HLA", options.exerciseId());
|
|
|
|
myCorbaSpecificStuff corba(argc, argv);
|
|
|
|
HighLevelArchitecture::Settings::setIniFile(options.iniFile());
|
|
|
|
qputenv("MAKLMGRD_LICENSE_FILE", HighLevelArchitecture::Settings::hlaLicenseServer());
|
|
|
|
{
|
|
std::unique_ptr<HighLevelArchitecture::MainHandler> mainHandler(new HighLevelArchitecture::MainHandler);
|
|
if (mainHandler->init(options.domainId(), options.exerciseId()))
|
|
{
|
|
STARTUP_LOG(app.baseLogger());
|
|
iRet = app.exec();
|
|
SHUTDOWN_LOG(app.baseLogger());
|
|
}
|
|
}
|
|
|
|
return iRet;
|
|
}
|