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>
132 lines
3.0 KiB
Plaintext
132 lines
3.0 KiB
Plaintext
#
|
|
# $Id$
|
|
# $HeadURL$
|
|
#
|
|
|
|
%define conf_dir /opt/AVS/etc
|
|
%define project @PROJECT@
|
|
|
|
Name: %{project}_avs_conf
|
|
Summary: AVS configuration
|
|
Version: @VERSION@
|
|
Release: @RELEASE@
|
|
Vendor: Rheinmetall Electronics GmbH
|
|
URL: http://www.rheinmetall-electronics.de
|
|
Packager: ctc
|
|
Group: Applications/Configuration
|
|
License: proprietary
|
|
Source0: avs_conf.tgz
|
|
BuildArch: noarch
|
|
#Requires:
|
|
#BuildRequires:
|
|
|
|
|
|
%description
|
|
dummy -- we build sub-packages only
|
|
|
|
|
|
%changelog
|
|
#* LANG=en_US.UTF-8 date +"%a %b %d %Y" text
|
|
* Wed May 22 2019 cf
|
|
added Vendor, changed URL
|
|
* Fri Apr 27 2018 cf
|
|
initial version
|
|
|
|
|
|
|
|
# -c: create toplevel directory and extract contents there
|
|
%prep
|
|
%setup -q -c
|
|
|
|
|
|
# nothing to build
|
|
%build
|
|
|
|
|
|
%install
|
|
mkdir -p %{buildroot}%{conf_dir}
|
|
# copy all config files but legacy conf
|
|
find %{project}/ ! -name AVS_Workstation_legacy.conf -name *.conf -maxdepth 1 -exec cp -t %{buildroot}%{conf_dir}/ {} +
|
|
|
|
|
|
# no %files section -- we build sub-packages only
|
|
#%files
|
|
|
|
|
|
%package ws
|
|
Summary: AVS configuration for workstations
|
|
Requires: %{project}_AVS_Workstation
|
|
Conflicts: %{project}_avs_conf-aar
|
|
Conflicts: %{project}_avs_conf-legacy-ws
|
|
%description ws
|
|
AVS configuration for workstations
|
|
%files ws
|
|
%defattr(-,ctc,ctc)
|
|
%{conf_dir}/AVS_Config.conf
|
|
%{conf_dir}/AVS_DB.conf
|
|
%{conf_dir}/AVS_Export.conf
|
|
%{conf_dir}/AVS_Mixer.conf
|
|
%{conf_dir}/AVS_Workstation.conf
|
|
|
|
%package aar
|
|
Summary: AVS configuration for AAR workstations
|
|
Requires: %{project}_AVS_Workstation
|
|
Requires: %{project}_AVS_Root
|
|
Requires: %{project}_AVS_Server
|
|
Conflicts: %{project}_avs_conf-ws
|
|
Conflicts: %{project}_avs_conf-sv
|
|
Conflicts: %{project}_avs_conf-legacy-ws
|
|
%description aar
|
|
AVS configuration for AAR workstations
|
|
%files aar
|
|
%defattr(-,ctc,ctc)
|
|
%{conf_dir}/AVS_Config.conf
|
|
%{conf_dir}/AVS_DB.conf
|
|
%{conf_dir}/AVS_Export.conf
|
|
%{conf_dir}/AVS_Mixer.conf
|
|
%{conf_dir}/AVS_Root.conf
|
|
%{conf_dir}/AVS_Server.aar.conf
|
|
%{conf_dir}/AVS_Workstation.conf
|
|
|
|
%post aar
|
|
/sbin/ldconfig
|
|
if [ $1 -eq 1 ] || [ $1 -eq 2 ]; then
|
|
ln -sf %{conf_dir}/AVS_Server.aar.conf %{conf_dir}/AVS_Server.conf
|
|
if [ ! -e /data ]; then
|
|
mkdir /data;
|
|
fi
|
|
chown ctc_ws:ctc /data
|
|
fi
|
|
|
|
%preun aar
|
|
if [ $1 -eq 0 ]; then
|
|
rm -f %{conf_dir}/AVS_Server.conf
|
|
rm -rf /data
|
|
fi
|
|
|
|
|
|
%package sv
|
|
Summary: AVS configuration for AVS-server
|
|
Requires: %{project}_AVS_Config
|
|
Requires: %{project}_AVS_Interface
|
|
Requires: %{project}_AVS_MotionRecorder
|
|
Requires: %{project}_AVS_Root
|
|
Requires: %{project}_AVS_Server
|
|
Requires: %{project}_AVS_TimelineConverter
|
|
# A conditional require depending on a specific project can be done like this:
|
|
%if "%{project}" == "some_future_project"
|
|
Requires: %{project}_AVS_Mobilegate
|
|
%endif
|
|
%description sv
|
|
AVS configuration for AVS-server
|
|
%files sv
|
|
%defattr(-,ctc,ctc)
|
|
%{conf_dir}/AVS_Config.conf
|
|
%{conf_dir}/AVS_DB.conf
|
|
%{conf_dir}/AVS_Interface.conf
|
|
%{conf_dir}/AVS_Mobilegate.conf
|
|
%{conf_dir}/AVS_MotionRecorder.conf
|
|
%{conf_dir}/AVS_Root.conf
|
|
%{conf_dir}/AVS_Server.conf
|
|
%{conf_dir}/AVS_TimelineConverter.conf
|