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>
28 lines
908 B
Bash
Executable File
28 lines
908 B
Bash
Executable File
#!/bin/sh
|
|
# Helper script to import BT 56
|
|
# $Id$
|
|
# $HeadURL$
|
|
# $Author$
|
|
# Created by Christian Ehrlicher, SLSE, 2017-05-04
|
|
|
|
import_xml_path=/shd/CTC/TOOLS/TDS/TDS-build/bin/
|
|
#import_xml_path=/home/chehrlic/TDS/TDS-build-product/bin/
|
|
svn_host=renoir.defence-elec.de
|
|
#svn_host=ccsaws01:8082
|
|
out_dir=`mktemp -d`
|
|
|
|
echo "svn user: ehrlicher_c"
|
|
echo "svn passwd: svnraptor"
|
|
echo "svn host should be renoir.defence-elec.de or ccsaws01:8082 in project net)"
|
|
echo "import_xml_path is ${import_xml_path}"
|
|
|
|
svn co http://${svn_host}/svn/GUEZEW50/trunk/Referenzgebaeude_BT56 ${out_dir}
|
|
${import_xml_path}/ismImportBuildings -x ${out_dir}/building/bldg_56_ref.flt.xml -y ${out_dir}/building/bldg_56_ref.flt.VWM_Building.xml -p 0.155273655,0.9259746511,0,318.82 -w 126
|
|
ret=$?
|
|
rm -rf ${out_dir}
|
|
if [ $ret -eq 0 ]; then
|
|
echo "Import successful"
|
|
else
|
|
echo "Import failed - see logfile at /shd/CTC/LOG/${USER}_ism.log"
|
|
fi
|