Provides release 2 first iteration

2026-11-11 09:45:04 +00:00
1 parent faa9244421
commit 0459d64ef8
@@ -16,7 +16,9 @@ else()
 endif()

 # Add only existing subdirectories to allow partial checkouts / incremental migration
-set(LTS_SUBDIRS Tools Application DDS Common Services Proxies Plugins Viewer Projects)
+# Release 2 scope: Tools, DDS, Common, Services (minimal), Proxies (TrainingAreaBase only), Plugins (Styles only for LtsWidgets dependency)
+# Excluded: Application, Viewer, Projects, most Plugins (not in Release 2)
+set(LTS_SUBDIRS Tools DDS Common Services Proxies Plugins)
 foreach(dir IN LISTS LTS_SUBDIRS)
  if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${dir}")
  # Use guarded add so top-level MIGRATE_MODULE can restrict which Lts subdirs are included
@@ -4,30 +4,20 @@
 # $Author$
 #

+# Release 2 Common modules (S set: 15 modules)
 ADD_SUBDIRECTORY(CodeGen)
 ADD_SUBDIRECTORY(httq)
 ADD_SUBDIRECTORY(LtsAppDescriptor)
-ADD_SUBDIRECTORY(LtsAppManager)
 ADD_SUBDIRECTORY(LtsCommandLineParser)
-ADD_SUBDIRECTORY(LtsCoordinate)
 ADD_SUBDIRECTORY(LtsCoordTrans)
-ADD_SUBDIRECTORY(LtsElevation)
 ADD_SUBDIRECTORY(LtsLicence)
-ADD_SUBDIRECTORY(LtsLogin)
-ADD_SUBDIRECTORY(LtsMultiMonitor)
 ADD_SUBDIRECTORY(LtsNotification)
 ADD_SUBDIRECTORY(LtsPluginManager)
-ADD_SUBDIRECTORY(LtsPrinting)
-ADD_SUBDIRECTORY(LtsProjectionWorkstation)
 ADD_SUBDIRECTORY(LtsRestClient)
-ADD_SUBDIRECTORY(LtsScriptTimeline)
 ADD_SUBDIRECTORY(LtsSerialPortQuerry)
-ADD_SUBDIRECTORY(LtsSession)
-ADD_SUBDIRECTORY(LtsTimeline)
 ADD_SUBDIRECTORY(LtsUtils)
-ADD_SUBDIRECTORY(LtsVirtualKeyboard)
 ADD_SUBDIRECTORY(LtsWebSocket)
 ADD_SUBDIRECTORY(LtsWidgets)
-ADD_SUBDIRECTORY(PluginInterfaces)
 ADD_SUBDIRECTORY(ProjectConfig)
 ADD_SUBDIRECTORY(TopicEditorBase)
+# Excluded from Release 2: LtsAppManager, LtsCoordinate, LtsElevation, LtsLogin, LtsMultiMonitor, LtsPrinting, LtsProjectionWorkstation, LtsScriptTimeline, LtsTimeline, LtsVirtualKeyboard, PluginInterfaces
@@ -23,85 +23,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../include/LtsSession/)
 # Add TopicEditorBase stub headers
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../include/TopicEditorBase/)

-ADD_SUBDIRECTORY(AdvancedSymbology)
-ADD_SUBDIRECTORY(AppStarter)
-ADD_SUBDIRECTORY(AreaEffectSimulation)
-ADD_SUBDIRECTORY(AssetManagement)
-ADD_SUBDIRECTORY(AudioVideoManagement) # uses old ifc !
-ADD_SUBDIRECTORY(Battery)
-ADD_SUBDIRECTORY(Buildings)
-ADD_SUBDIRECTORY(BuildingViewer) # uses ZW connections (uses sql, ace, ..)
-ADD_SUBDIRECTORY(CentralEffectSimulation)
-IF(BUILD_CODIFICATION)
-  ADD_SUBDIRECTORY(CodificationManagement)
-  ADD_SUBDIRECTORY(CodificationManagement/Test)
-ENDIF()
-ADD_SUBDIRECTORY(CollateralDamageSimulation)
-ADD_SUBDIRECTORY(EffectManagement)
-ADD_SUBDIRECTORY(EffectShowClient)
-ADD_SUBDIRECTORY(EffectShowManagement)
-ADD_SUBDIRECTORY(Evaluations)
-IF(BUILD_RTI)
-  ADD_SUBDIRECTORY(ExerciseManagement)
-ENDIF()
-ADD_SUBDIRECTORY(FileManagement)
-IF(BUILD_FILTERMANAGEMENT)
-  ADD_SUBDIRECTORY(FilterManagement)
-ENDIF()
-ADD_SUBDIRECTORY(FreeSpace)
-ADD_SUBDIRECTORY(GuezIedManagement)
-IF(BUILD_RTI)
-  ADD_SUBDIRECTORY(GuezNasat)
-ENDIF()
-ADD_SUBDIRECTORY(InfrastructureManagement) # ResMgt uses nglwidgets => NGLTreeModel
-ADD_SUBDIRECTORY(MarkerManagement)
-ADD_SUBDIRECTORY(Messaging)
-ADD_SUBDIRECTORY(MeteoDataManagement)
-ADD_SUBDIRECTORY(NmeaManagement)
-ADD_SUBDIRECTORY(NotificationManagement)
-ADD_SUBDIRECTORY(OcBaseDownload)
-ADD_SUBDIRECTORY(OcSituationClient)
-ADD_SUBDIRECTORY(OnlineReports)
-ADD_SUBDIRECTORY(OperatorManagement)
-IF(BUILD_RTI)
-  ADD_SUBDIRECTORY(ParticipantManagement) # includes ParticipantOrgChart (conditionally built)
-ENDIF()
-# PlanEditor requires WebEngine + ArcGIS - skip for Qt6 migration baseline
-IF(BUILD_PLUGINS_PLANEDITOR)
-  ADD_SUBDIRECTORY(PlanEditor)
-ENDIF()
-ADD_SUBDIRECTORY(PlanOverlays)
-IF(BUILD_RTI)
-  ADD_SUBDIRECTORY(PresentationManagement)
-ENDIF()
-ADD_SUBDIRECTORY(ProjectDataManagement)
-ADD_SUBDIRECTORY(ProjectionWorkstation)
-ADD_SUBDIRECTORY(ReportManagement)
-ADD_SUBDIRECTORY(SAAs)
-ADD_SUBDIRECTORY(ScreenRecording)
-ADD_SUBDIRECTORY(ServiceManagement)
-# ServiceMonitor requires WebEngine - skip for Qt6 migration baseline
-IF(BUILD_PLUGINS_SERVICEMONITOR)
-  ADD_SUBDIRECTORY(ServiceMonitor)
-ENDIF()
-ADD_SUBDIRECTORY(SituationMapPlugin)
-ADD_SUBDIRECTORY(SituationReplay)
-ADD_SUBDIRECTORY(SituationReplayManagement)
+# Release 2: Only Styles plugin needed for LtsWidgets dependency (TabBarTabStyle)
 ADD_SUBDIRECTORY(Styles)
-ADD_SUBDIRECTORY(TargetManagement)
-ADD_SUBDIRECTORY(Timeline)
-ADD_SUBDIRECTORY(TrainingAreaBase)
-ADD_SUBDIRECTORY(TakeHomePackageManager)
-ADD_SUBDIRECTORY(TrainingAreaBaseOC)
-ADD_SUBDIRECTORY(AlarmManagement)
-ADD_SUBDIRECTORY(DeveloperTools)
-ADD_SUBDIRECTORY(ComponentMonitor)
-#ADD_SUBDIRECTORY(ObserverController)
-ADD_SUBDIRECTORY(VirtualKeyboard)
-IF(GUEZ_MODE)
-  ADD_SUBDIRECTORY(WarehouseManagement)
-ENDIF()
-# OnlineHelp requires WebEngine - skip for Qt6 migration baseline
-IF(BUILD_PLUGINS_ONLINEHELP)
-  ADD_SUBDIRECTORY(OnlineHelp)
-ENDIF()
+# Excluded from Release 2: All other plugins (AdvancedSymbology, AppStarter, AreaEffectSimulation, etc.)
@@ -4,30 +4,7 @@
 # $Author:
 #

-OPTION(BUILD_SVC_HLA "Build service HighLevelArchitecture (default: OFF)" OFF)
-OPTION(BUILD_WLS "Build service WirelessLocationSystem (default: OFF)" OFF)
-
-IF(BUILD_RTI)
-  ADD_SUBDIRECTORY(Buildings)
-  ADD_SUBDIRECTORY(WarehouseManagement)
-ENDIF()
-
-# TrainingAreaBase is a core dependency - always include it when Proxies is included
+# Release 2 Proxies modules (S set: TrainingAreaBase only)
+# TrainingAreaBase is a core dependency from first-release scope - always include it
 ADD_SUBDIRECTORY(TrainingAreaBase) # sql
-IF(BUILD_RTI)
-  ADD_SUBDIRECTORY(TrainingAreaBaseOC)
-ENDIF()
-
-ADD_SUBDIRECTORY(CombatNetRadio)
-ADD_SUBDIRECTORY(DifferentialGPS)
-IF(BUILD_RTI)
-  ADD_SUBDIRECTORY(GuezNasat) # rpcgen
-ENDIF()
-
-IF(BUILD_RTI)
-  ADD_SUBDIRECTORY(ComponentMonitor)
-ENDIF()
-
-IF (BUILD_WLS)
-  ADD_SUBDIRECTORY(WirelessLocationSystem)
-ENDIF()
+# Excluded from Release 2: Buildings, WarehouseManagement, TrainingAreaBaseOC, CombatNetRadio, DifferentialGPS, GuezNasat, ComponentMonitor, WirelessLocationSystem
@@ -4,53 +4,10 @@
 # $Author:
 #

-# InfrastructureManagement muss zuerst gebaut werden (svcIsmCommon wird von anderen Services benötigt)
-ADD_SUBDIRECTORY(InfrastructureManagement)
-ADD_SUBDIRECTORY(AlarmManagement)
-ADD_SUBDIRECTORY(AreaEffectSimulation)
-ADD_SUBDIRECTORY(AudioVideoManagement)
-ADD_SUBDIRECTORY(AssetManagement)
-ADD_SUBDIRECTORY(CentralEffectSimulation)
-ADD_SUBDIRECTORY(CodificationManagement)
-ADD_SUBDIRECTORY(EffectShowManagement)
-ADD_SUBDIRECTORY(EffectShowClient)
-ADD_SUBDIRECTORY(Evaluations)
+# Release 2 Services modules (S set: 3 directories, 6 service modules)
+# Required by AP9 generator tools and TrainingAreaBase
 ADD_SUBDIRECTORY(ExerciseManagement)
-ADD_SUBDIRECTORY(ExerciseEventManagement)
-ADD_SUBDIRECTORY(FileManagement)
-ADD_SUBDIRECTORY(FilterManagement)
-ADD_SUBDIRECTORY(GuezIedManagement)
-ADD_SUBDIRECTORY(GuezMinelayerProcessing)
-ADD_SUBDIRECTORY(MarkerManagement)
-ADD_SUBDIRECTORY(Messaging)
-ADD_SUBDIRECTORY(MeteoDataManagement)
-ADD_SUBDIRECTORY(NotificationManagement)
-ADD_SUBDIRECTORY(NmeaManagement)
-ADD_SUBDIRECTORY(OcBaseDownload)
-ADD_SUBDIRECTORY(OcSituationClient)
-ADD_SUBDIRECTORY(OcSituationServer)
-ADD_SUBDIRECTORY(OnlineReports)
-ADD_SUBDIRECTORY(OperatorManagement)
 ADD_SUBDIRECTORY(ParticipantManagement)
-ADD_SUBDIRECTORY(PlanEditor)
-ADD_SUBDIRECTORY(PresentationManagement)
 ADD_SUBDIRECTORY(ProjectDataManagement)
-ADD_SUBDIRECTORY(ProjectionWorkstation)
-ADD_SUBDIRECTORY(RecordingManagement)
-ADD_SUBDIRECTORY(ReportManagement)
-ADD_SUBDIRECTORY(RoutingServiceNG)
-ADD_SUBDIRECTORY(ServiceManagement)
-ADD_SUBDIRECTORY(ScreenRecording)
-ADD_SUBDIRECTORY(ServiceMonitor)
-ADD_SUBDIRECTORY(SituationMap)
-ADD_SUBDIRECTORY(SituationReplayManagement)
-ADD_SUBDIRECTORY(SituationReplay)
-ADD_SUBDIRECTORY(SoundManagement)
-ADD_SUBDIRECTORY(TargetManagement)
-IF (NOT BUILD_RPM)
-  ADD_SUBDIRECTORY(VideoOverlayManagement)
-ENDIF()
-IF(GUEZ_MODE)
-  ADD_SUBDIRECTORY(WarehouseGuez)
-ENDIF()
+# Excluded from Release 2: InfrastructureManagement, AlarmManagement, AreaEffectSimulation, AudioVideoManagement, AssetManagement, CentralEffectSimulation, CodificationManagement, EffectShowManagement, EffectShowClient, Evaluations, ExerciseEventManagement, FileManagement, FilterManagement, GuezIedManagement, GuezMinelayerProcessing, MarkerManagement, Messaging, MeteoDataManagement, NotificationManagement, NmeaManagement, OcBaseDownload, OcSituationClient, OcSituationServer, OnlineReports, OperatorManagement, PlanEditor, PresentationManagement, ProjectionWorkstation, RecordingManagement, ReportManagement, RoutingServiceNG, ServiceManagement, ScreenRecording, ServiceMonitor, SituationMap, SituationReplayManagement, SituationReplay, SoundManagement, TargetManagement, VideoOverlayManagement, WarehouseGuez
 NGL_INSTALL(AAR SV FILES "alias" DESTINATION "." RENAME ".alias")
@@ -4,65 +4,13 @@
 # $Author$
 #

-ADD_SUBDIRECTORY(Adler)
-ADD_SUBDIRECTORY(AsmWorkstationCertifier)
-ADD_SUBDIRECTORY(CnrProxyTester)
-ADD_SUBDIRECTORY(ConfigX)
+# Release 2 Tools modules (S set: 7 tools + TopicDiscover)
+# AP9 scope: DdsView, LogViewer, SqlBrowser, 3 generators, lupdate
 ADD_SUBDIRECTORY(DataSampleGenerator)
-ADD_SUBDIRECTORY(DataSampleReceiver)
-ADD_SUBDIRECTORY(DBAdministration)
-ADD_SUBDIRECTORY(DBOperatorSettingsRemover)
 ADD_SUBDIRECTORY(DdsView)
-ADD_SUBDIRECTORY(DotMatrixDisplay)
-ADD_SUBDIRECTORY(EEMFakeServer)
-ADD_SUBDIRECTORY(LicenceEditor)
-ADD_SUBDIRECTORY(LocalDomainFinder)
-#ADD_SUBDIRECTORY(LoginTest)
 ADD_SUBDIRECTORY(LogViewer)
 ADD_SUBDIRECTORY(ParticipantDataGenerator)
-ADD_SUBDIRECTORY(ProjectSettingsEditor)
-ADD_SUBDIRECTORY(QLedLine)
-ADD_SUBDIRECTORY(QLedMatrix)
-ADD_SUBDIRECTORY(RestClientUi)
-ADD_SUBDIRECTORY(ScreenIdShow)
-ADD_SUBDIRECTORY(SerialToTcpConverter)
-ADD_SUBDIRECTORY(Splash)
 ADD_SUBDIRECTORY(SqlBrowser)
-ADD_SUBDIRECTORY(DateTimeSyncer)
-ADD_SUBDIRECTORY(Times)
 ADD_SUBDIRECTORY(TopicDiscover)
-ADD_SUBDIRECTORY(VapixConfig)
-ADD_SUBDIRECTORY(Automount)
-ADD_SUBDIRECTORY(EgcuSimulator)
-ADD_SUBDIRECTORY(TextEditorTest)
-#ADD_SUBDIRECTORY(Examples/Plugins)
-ADD_SUBDIRECTORY(Examples/TestGuiElement)
-
-#ADD_SUBDIRECTORY(VideoImport)
 ADD_SUBDIRECTORY(VulnerabilityStateGenerator)
-IF (BUILD_WLS)
-  ADD_SUBDIRECTORY(WlsRandomPositions)
-ENDIF()
-
-IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
-  ADD_SUBDIRECTORY(InfrastructureManagement)
-  ADD_SUBDIRECTORY(WirelessLocationTools)
-ENDIF()
-
-IF (BUILD_TOOLSSV)
-  ADD_SUBDIRECTORY(DBUpdate)
-ENDIF()
-
-SET(SCRIPTS
-  startDDSSpy
-  check_start_services
-)
-NGL_INSTALL(AAR SV PROGRAMS ${SCRIPTS} DESTINATION bin)
-
-SET(SCRIPTS_2
-  remove_old_coredumps
-)
-NGL_INSTALL(AAR SV WS PROGRAMS ${SCRIPTS_2} DESTINATION bin)
-
-NGL_INSTALL(AAR WS DIRECTORY "THP2" DESTINATION "share/Lts/")
-NGL_INSTALL(AAR WS DIRECTORY "THP-overview" DESTINATION "share/Lts/")
+# Excluded from Release 2: Adler, AsmWorkstationCertifier, CnrProxyTester, ConfigX, DataSampleReceiver, DBAdministration, DBOperatorSettingsRemover, DotMatrixDisplay, EEMFakeServer, LicenceEditor, LocalDomainFinder, LoginTest, ProjectSettingsEditor, QLedLine, QLedMatrix, RestClientUi, ScreenIdShow, SerialToTcpConverter, Splash, DateTimeSyncer, Times, VapixConfig, Automount, EgcuSimulator, TextEditorTest, Examples/Plugins, Examples/TestGuiElement, VideoImport, InfrastructureManagement, WirelessLocationTools, DBUpdate, WlsRandomPositions
@@ -1029,66 +1029,17 @@ if [[ "${BUILD_CODIFICATION}" == "ON" ]]; then
  GROUP5_TARGETS+=("LtsReportDisplay")
 fi

-# Group 6: LTS Tools (Qt6 migration targets)
-# These tools require RTI DDS for DataSampleGenerator, DataSampleReceiver, and DdsView
+# Group 6: LTS Tools (Qt6 migration targets) - Release 2 AP9 scope only
+# These tools require RTI DDS for DataSampleGenerator and DdsView
 GROUP6_TARGETS=(
-  dbAdministration
-  SettingsRemover
-  dbUpdate
+  # AP9 tools for Release 2
  tDataSampleGenerator
-  tDataSampleReceiver
-  DateTimeSyncer
  ddsview
-  # ddsview runtime topic-type plugins (39 *TopicTypePlugin.so). Not CMake link deps of
-  # ddsview (loaded at runtime via LtsPluginLoader), so `make ddsview` alone skips them and
-  # ddsview shows empty Data/Function topic lists. Built here alongside ddsview.
-  aesTopicTypePlugin
-  almTopicTypePlugin
-  asmTopicTypePlugin
-  avmTopicTypePlugin
-  bldTopicTypePlugin
-  cesTopicTypePlugin
-  cmoTopicTypePlugin
-  codTopicTypePlugin
-  coreTopicTypePlugin
-  eemTopicTypePlugin
-  escTopicTypePlugin
-  esmTopicTypePlugin
-  evlTopicTypePlugin
-  exmTopicTypePlugin
-  flmTopicTypePlugin
-  fltTopicTypePlugin
-  gimTopicTypePlugin
-  gnaTopicTypePlugin
-  ismTopicTypePlugin
-  mdmTopicTypePlugin
-  mrkTopicTypePlugin
-  msgTopicTypePlugin
-  nmeTopicTypePlugin
-  nomTopicTypePlugin
-  obdTopicTypePlugin
-  opmTopicTypePlugin
-  oscTopicTypePlugin
-  ossTopicTypePlugin
-  pdmTopicTypePlugin
-  ppmTopicTypePlugin
-  preTopicTypePlugin
-  repTopicTypePlugin
-  scmTopicTypePlugin
-  somTopicTypePlugin
-  srpTopicTypePlugin
-  tabTopicTypePlugin
-  tabocTopicTypePlugin
-  tgtTopicTypePlugin
-  whgTopicTypePlugin
-  displayPanelSimulator
-  LicenceEditor
-  localDomainFinder
-  LogView
  LogViewer
-  CoPrtCnv
-  PrtCnvLib
-  PrtCnv
+  ParticipantDataGenerator
+  sqlbrowser
+  topicdiscover
+  VulnerabilityStateGenerator
 )

 # Group 7: LTS Tools A,B,C,E,I directories (Qt6 migration targets)