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>
70 lines
1.7 KiB
Bash
Executable File
70 lines
1.7 KiB
Bash
Executable File
#!/bin/bash
|
|
set -e
|
|
|
|
# Check if .envrc exists
|
|
if [ ! -f .envrc ]; then
|
|
echo "ERROR: .envrc not found in current directory"
|
|
echo "Please create .envrc with required environment variables (e.g., MIGRATE_PIPELINE_ROOT)"
|
|
exit 1
|
|
fi
|
|
|
|
# Load environment variables from .envrc
|
|
set -a
|
|
source .envrc
|
|
set +a
|
|
|
|
# Allow BUILD_RTI to be overridden via environment variable or argument
|
|
BUILD_RTI="${BUILD_RTI:-ON}"
|
|
if [ "$1" = "OFF" ]; then
|
|
BUILD_RTI=OFF
|
|
elif [ "$1" = "ON" ]; then
|
|
BUILD_RTI=ON
|
|
fi
|
|
|
|
# Run CMake configuration and build inside Docker
|
|
docker run --rm \
|
|
-e MIGRATE_PIPELINE_ROOT \
|
|
-e LANG \
|
|
-e LC_ALL \
|
|
-e BUILD_RTI \
|
|
-v ${MIGRATE_PIPELINE_ROOT}:/workspace \
|
|
-v ${MIGRATE_PIPELINE_ROOT}/rti_license.dat:/workspace/rti_license.dat \
|
|
-w /workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus \
|
|
ubuntu:26.04 bash -c "
|
|
apt-get update -qq && \
|
|
apt-get install -y -qq \
|
|
build-essential \
|
|
cmake \
|
|
libkf6texttemplate-dev \
|
|
libqt6core6 \
|
|
libqt6gui6 \
|
|
libqt6widgets6 \
|
|
qt6-base-dev \
|
|
qt6-tools-dev-tools \
|
|
qt6-tools-dev \
|
|
qt6-l10n-tools \
|
|
libgtest-dev \
|
|
libpq-dev \
|
|
postgresql-server-dev-all \
|
|
libvlc-dev \
|
|
vlc-plugin-base \
|
|
git > /dev/null 2>&1
|
|
|
|
# Set RTI license
|
|
export RTI_LICENSE_FILE=/workspace/rti_license.dat
|
|
|
|
# Qt6 is installed via apt - CMake finds it automatically in /usr/lib/x86_64-linux-gnu/cmake
|
|
|
|
# Clean and configure
|
|
rm -rf build4
|
|
mkdir -p build4
|
|
cd build4
|
|
|
|
cmake .. \
|
|
-DBUILD_RTI=${BUILD_RTI} \
|
|
-DBUILD_ARCGIS=OFF \
|
|
-DCMAKE_CXX_STANDARD=17
|
|
|
|
make -j8 ddscore ddsftccore ddsQoS ddsconnector ddsfts 2>&1 | tee build.log
|
|
"
|