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>
54 lines
1.2 KiB
C++
54 lines
1.2 KiB
C++
#include "configurator.h"
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <QApplication>
|
|
#include <QMessageBox>
|
|
#include <QProcess>
|
|
#include <QDebug>
|
|
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
QApplication app(argc, argv);
|
|
|
|
QStringList arguments = app.arguments();
|
|
|
|
if (arguments.count() < 2)
|
|
{
|
|
qWarning() << "usage:" << arguments.at(0)
|
|
<< "<project name (" << Configurator::projectNames().join(QStringLiteral(", ")) << ")>";
|
|
return -1;
|
|
}
|
|
|
|
QString projectName = arguments.at(1);
|
|
if (!Configurator::projectNames().contains(projectName))
|
|
{
|
|
QMessageBox::critical(nullptr, QString(),
|
|
QStringLiteral("Unknown project. Available project names: %1").arg(
|
|
Configurator::projectNames().join(QStringLiteral(", "))));
|
|
return -2;
|
|
}
|
|
|
|
bool isDebug = (arguments.count() > 2 && arguments.at(2) == QStringLiteral("debug"));
|
|
|
|
if (!isDebug)
|
|
{
|
|
// restart if not root
|
|
uid_t uid = getuid();
|
|
|
|
if (uid != 0) // root
|
|
{
|
|
QProcess::startDetached(QStringLiteral("xgd-su -c %1 %2").arg(arguments.at(0), projectName));
|
|
//qWarning() << "wrong uid" << uid;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
Configurator *c = new Configurator(projectName);
|
|
c->show();
|
|
|
|
return app.exec();
|
|
}
|