Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 torsten
|
6493829fa4 | ||
|
torsten
|
b75578c188 | ||
|
torsten
|
77c67c12ca |
No files matched your search
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,13 @@
|
||||
execute instructions in ./prompts/migrate-lts-tools-d-and-l.md
|
||||
|
||||
---
|
||||
|
||||
execute the same instructions but now for tools in folders you are getting with ls ./Lts/Tools/A* ./Lts/Tools/B* ./Lts/Tools/C* ./Lts/Tools/E* ./Lts/Tools/I*
|
||||
|
||||
---
|
||||
|
||||
execute the same instructions but now for tools in folders you are getting with ls ./Lts/Tools/J* ./Lts/Tools/M* ./Lts/Tools/N* ./Lts/Tools/P* ./Lts/Tools/Q*
|
||||
|
||||
---
|
||||
|
||||
execute the same instructions but now for tools in folders you are getting with ls ./Lts/Tools/R* ./Lts/Tools/S* ./Lts/Tools/T* ./Lts/Tools/V* ./Lts/Tools/W*
|
||||
@@ -1,175 +0,0 @@
|
||||
# ArcGIS Build Requirements Analysis
|
||||
|
||||
## Overview
|
||||
|
||||
This document analyzes the requirements for building full ArcGIS-enabled Qt6 applications in the Qt6 migration pipeline.
|
||||
|
||||
**Date:** 2026-09-24
|
||||
**Branch:** feature/lts-viewer-validation-testing-phase
|
||||
**Submodule:** qt6-migration-pipeline/qt-migration-legatus/qt6-after/qt6-migrated-legatus
|
||||
|
||||
---
|
||||
|
||||
## SDK Structure
|
||||
|
||||
**Location:** `./external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk/`
|
||||
|
||||
### Components Status
|
||||
|
||||
| Component | Status | Location |
|
||||
|-----------|--------|----------|
|
||||
| **Headers** | ✅ Present | `sdk/include/` (37K+ header files) |
|
||||
| **Linux x64 Libraries** | ✅ Present | `sdk/linux/x64/lib/` |
|
||||
| - libruntimecore.so | ✅ 162MB | Core runtime engine |
|
||||
| - libEsriCommonQt.so | ✅ 27MB | Common Qt bindings |
|
||||
| - libEsriRuntimeQt.a | ✅ 86MB | Static C++ API library |
|
||||
| **CMake Config** | ✅ Present | `sdk/ideintegration/ArcGISRuntime.cmake` |
|
||||
|
||||
### CMake Targets Defined
|
||||
|
||||
The `ArcGISRuntime.cmake` module defines the following imported targets:
|
||||
|
||||
- `ArcGIS::Core` - Core runtime (shared library)
|
||||
- `ArcGIS::Cpp` - C++ API (static library)
|
||||
|
||||
---
|
||||
|
||||
## Missing Requirements for Full Builds
|
||||
|
||||
### 1. ArcGIS Runtime SDK License ⚠️
|
||||
|
||||
The ArcGIS Maps SDK for Qt is **proprietary software** from Esri:
|
||||
- Requires a valid license for production use
|
||||
- Must be obtained separately from Esri
|
||||
- Not included in this repository
|
||||
|
||||
### 2. Runtime Dependencies
|
||||
|
||||
For deployment, the following are needed:
|
||||
- No `bin/` or `plugins/` directory in SDK (Qt plugins not bundled)
|
||||
- Application must bundle required Qt plugins separately
|
||||
- Runtime library path must include `/sdk/linux/x64/lib/`
|
||||
|
||||
### 3. Docker Build Integration
|
||||
|
||||
The SDK must be **mounted into Docker container** during build:
|
||||
|
||||
```bash
|
||||
-v /path/to/sdk:/workspace/external/ArcGIS
|
||||
```
|
||||
|
||||
The `install_arcgis.sh` script:
|
||||
- Expects SDK at `/workspace/external/ArcGIS`
|
||||
- Creates symlink to `/repo/external/ArcGIS/MapsSDK_Qt_300.0.0/...`
|
||||
|
||||
---
|
||||
|
||||
## Build Configuration
|
||||
|
||||
### Enable ArcGIS Builds
|
||||
|
||||
```bash
|
||||
./new_docker_build.sh --arcgis --group5
|
||||
```
|
||||
|
||||
This will:
|
||||
- Set `BUILD_ARCGIS=ON`
|
||||
- Add ArcGIS SDK to `CMAKE_PREFIX_PATH`
|
||||
- Enable `advancedSymbology` library build
|
||||
- Link against `ArcGIS::ArcGIS` target
|
||||
|
||||
### CMake Configuration
|
||||
|
||||
CMake expects the following prefix path:
|
||||
|
||||
```cmake
|
||||
-DCMAKE_PREFIX_PATH="...;/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk;/usr/local"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Dependency Chain
|
||||
|
||||
```
|
||||
advancedSymbology (Lts/Viewer/SituationMap/Symbology/)
|
||||
└── ArcGIS::ArcGIS (ArcGIS Runtime SDK)
|
||||
├── libruntimecore.so (162MB)
|
||||
├── libEsriCommonQt.so (27MB)
|
||||
└── libEsriRuntimeQt.a (86MB)
|
||||
|
||||
Lts/Plugins/AdvancedSymbology/
|
||||
├── AsbDataPlugin → advancedSymbology
|
||||
├── AsbSymbolProxyGuiPlugin → advancedSymbology
|
||||
└── AsbData → advancedSymbology
|
||||
```
|
||||
|
||||
### Key CMake Files
|
||||
|
||||
| File | Purpose |
|
||||
|------|---------|
|
||||
| `Lts/Viewer/SituationMap/Symbology/CMakeLists.txt` | Contains `BUILD_ARCGIS` conditional for advancedSymbology |
|
||||
| `Lts/Plugins/AdvancedSymbology/Data/CMakeLists.txt` | Links AsbData, AsbDataPlugin against advancedSymbology |
|
||||
| `Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/CMakeLists.txt` | Links AsbSymbolProxyGuiPlugin against advancedSymbology |
|
||||
| `cmake/FindArcGISRuntime.cmake` | Locates ArcGIS SDK (via ArcGISRuntime.cmake) |
|
||||
|
||||
---
|
||||
|
||||
## Current Status
|
||||
|
||||
### Viewer-Only Builds (Without ArcGIS)
|
||||
|
||||
| Component | Status |
|
||||
|-----------|--------|
|
||||
| LtsDataView | ✅ Builds successfully |
|
||||
| LtsDataViewTest | ✅ Passes CTest (headless) |
|
||||
| LtsReportDisplay | ✅ Builds with KDReports |
|
||||
| situationMapCommon | ✅ Builds successfully |
|
||||
| advancedSymbology | ⚠️ NOT built (requires ArcGIS license) |
|
||||
| Qt6 Deprecation Warnings | ✅ Zero warnings |
|
||||
|
||||
### Full ArcGIS-Enabled Builds
|
||||
|
||||
To enable full ArcGIS functionality:
|
||||
|
||||
1. ✅ SDK folder structure is complete
|
||||
2. ⚠️ Obtain ArcGIS Runtime SDK for Qt license from Esri
|
||||
3. ⚠️ Mount SDK into Docker build environment
|
||||
4. ⚠️ Build with `--arcgis` flag
|
||||
5. ⚠️ Ensure runtime library path includes ArcGIS libraries
|
||||
|
||||
---
|
||||
|
||||
## Verification Commands
|
||||
|
||||
### Check SDK Libraries
|
||||
|
||||
```bash
|
||||
find ./external/ArcGIS -name "*.so" -o -name "*.a"
|
||||
```
|
||||
|
||||
### Build with ArcGIS Support
|
||||
|
||||
```bash
|
||||
./new_docker_build.sh --arcgis --group5
|
||||
```
|
||||
|
||||
### Verify advancedSymbology Build
|
||||
|
||||
```bash
|
||||
# Check if library was built
|
||||
ls -la build4/lib/libadvancedSymbology.so
|
||||
|
||||
# Check CMake configure output for ArcGIS
|
||||
grep -i "arcgis" build4/CMakeCache.txt
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Conclusion
|
||||
|
||||
The SDK folder structure is **complete** for building ArcGIS-enabled applications. The only missing pieces are:
|
||||
|
||||
1. **Valid ArcGIS Runtime SDK license** (must be obtained from Esri)
|
||||
2. **Docker mount configuration** for CI/CD pipelines
|
||||
|
||||
For viewer-only validation testing, ArcGIS is **optional** — the core Viewer module (LtsDataView, LtsReportDisplay, situationMapCommon) builds and tests successfully without it.
|
||||
+40
-270
@@ -2,25 +2,7 @@
|
||||
|
||||
## Executive Summary
|
||||
|
||||
The Lts/Viewer module Qt6 migration is **code-complete**. All Qt5→Qt6 API migrations have been implemented and validated:
|
||||
|
||||
✓ **Qt6 API Migrations**: All `qAsConst()`, `QStringRef`, `QStringView`, and related patterns migrated
|
||||
✓ **ArcGIS Integration**: Header paths, Docker configuration, and build system fixed
|
||||
✓ **Build Validation**: Viewer module targets compile successfully (BUILD_ARCGIS=OFF validated)
|
||||
✓ **CTest Integration**: LtsDataViewTest registered and passing (1.04 sec)
|
||||
✓ **Build Script Enhancement**: `--build-viewer-only` option added to skip Groups 1-4 and build Viewer targets directly
|
||||
✓ **KDReports Support**: LtsReportDisplay builds successfully with codification support
|
||||
|
||||
**Build Status**: Viewer module code changes complete. Successfully validated with `--build-viewer-only --no-arcgis`:
|
||||
- ✓ situationMapCommon - Built successfully (no Qt6 warnings)
|
||||
- ✓ advancedSymbologyXML - Built successfully (no Qt6 warnings)
|
||||
- ✓ LtsDataView - Built successfully (no Qt6 warnings)
|
||||
- ✓ LtsDataViewTest - PASSED (1.04 sec, headless execution)
|
||||
- ✓ LtsReportDisplay - Built successfully with KDReports codification
|
||||
- ✗ LtsFileDialog - Excluded from viewer-only builds (requires Group 4 svcExmCommon)
|
||||
- ✗ advancedSymbology - Requires ArcGIS SDK headers (optional, requires SDK setup)
|
||||
|
||||
Full GROUP5 build with BUILD_ARCGIS=ON blocked by pre-existing errors in Group 3/4 dependencies (ProjectDataManagement, ExerciseManagement), not related to Qt6 migration.
|
||||
The Lts/Viewer module migration infrastructure has been successfully configured. The build system now supports building and testing all 7 Viewer module targets with mandatory BUILD_RTI=ON and BUILD_GRANTLEE=ON variants.
|
||||
|
||||
## Migration Scope
|
||||
|
||||
@@ -104,50 +86,12 @@ Significant pruning occurred in Qt6 migration:
|
||||
- `BUILD_RTI=OFF` ✗
|
||||
- `BUILD_GRANTLEE=OFF` ✗
|
||||
|
||||
### Docker Validation Commands
|
||||
|
||||
**Full Group 5 Build:**
|
||||
### Docker Validation Command
|
||||
```bash
|
||||
cd qt-migration-legatus/qt6-after/qt6-migrated-legatus
|
||||
BUILD_RTI=ON BUILD_GRANTLEE=ON ./new_docker_build.sh --group5
|
||||
```
|
||||
|
||||
**Viewer-Only Build (Skip Groups 1-4):**
|
||||
```bash
|
||||
cd qt-migration-legatus/qt6-after/qt6-migrated-legatus
|
||||
BUILD_RTI=ON BUILD_GRANTLEE=ON ./new_docker_build.sh --build-viewer-only
|
||||
```
|
||||
|
||||
**Viewer-Only without ArcGIS:**
|
||||
```bash
|
||||
cd qt-migration-legatus/qt6-after/qt6-migrated-legatus
|
||||
BUILD_RTI=ON BUILD_GRANTLEE=ON ./new_docker_build.sh --build-viewer-only --no-arcgis
|
||||
```
|
||||
|
||||
### --build-viewer-only Option
|
||||
|
||||
Added to bypass pre-existing Group 3/4 build errors and validate Viewer module directly.
|
||||
|
||||
**Features:**
|
||||
- Skips Groups 1-4 entirely
|
||||
- Enables Group 5 Viewer targets
|
||||
- Enables CTest for Viewer module tests
|
||||
- Allows isolated validation of Qt6 migration
|
||||
|
||||
**Test Results (--build-viewer-only --no-arcgis):**
|
||||
```
|
||||
✓ situationMapCommon - Built successfully (no Qt6 warnings)
|
||||
✓ advancedSymbologyXML - Built successfully (no Qt6 warnings)
|
||||
✓ LtsDataView - Built successfully (no Qt6 warnings)
|
||||
✓ LtsDataViewTest - PASSED (1.04 sec, headless execution)
|
||||
✗ LtsFileDialog - Excluded from viewer-only builds (requires Group 4)
|
||||
✓ LtsFileDialogTest - Excluded from viewer-only builds (requires Group 4)
|
||||
✗ advancedSymbology - Skipped (requires BUILD_ARCGIS=ON)
|
||||
✓ LtsReportDisplay - Built successfully with KDReports codification
|
||||
```
|
||||
|
||||
**Validation:** No Qt5→Qt6 deprecation warnings in any Viewer module targets.
|
||||
|
||||
### Direct CMake Build Command
|
||||
```bash
|
||||
cmake -S qt-migration-legatus/qt6-after/qt6-migrated-legatus \
|
||||
@@ -235,242 +179,68 @@ Required for Docker builds:
|
||||
- [x] CTest registration for LtsDataViewTest
|
||||
- [x] CTest registration for LtsFileDialogTest
|
||||
- [x] Git commit created
|
||||
- [x] **Qt6 API Migrations Complete**
|
||||
- [x] `qAsConst()` → `std::as_const()` (10+ files in SituationMap/Map, SymbologyImpl)
|
||||
- [x] `QStringRef` → `QStringView` (10+ files in Symbology, SymbologyImpl)
|
||||
- [x] `QString::splitRef()` → `split()` (SymbologyImpl)
|
||||
- [x] `QString::count()` → `size()` (Symbology)
|
||||
- [x] QStringView 3-arg constructor → `.slice()` pattern (11 occurrences in sidc_builder.cpp)
|
||||
- [x] Added `#include <utility>` for std::as_const (3 files)
|
||||
- [x] **ArcGIS Integration Fixes**
|
||||
- [x] Updated `new_docker_build.sh` with correct install_arcgis.sh path
|
||||
- [x] Updated `install_arcgis.sh` with Docker workspace paths (/workspace/external)
|
||||
- [x] Fixed FindArcGIS.cmake header path detection
|
||||
- [x] Removed `arcgis/` prefix from includes (base_symbol_model.h/cpp, symbol_dictionary_impl.cpp, esri_dictionary_processor.h)
|
||||
- [x] Removed problematic arcgis symlink causing "Too many levels of symbolic links" error
|
||||
- [x] **Build Validation (BUILD_ARCGIS=OFF)**
|
||||
- [x] Viewer module targets compile successfully: situationMapCommon, advancedSymbologyXML, LtsDataView
|
||||
- [x] No Qt5→Qt6 deprecation warnings in Viewer module
|
||||
- [x] LtsFileDialog blocked by ExerciseManagement/svcExmCommon dependency (pre-existing error)
|
||||
- [x] **--build-viewer-only Option Integration**
|
||||
- [x] Added `--build-viewer-only` command-line option to new_docker_build.sh
|
||||
- [x] Added BUILD_VIEWER_ONLY environment variable handling
|
||||
- [x] Added conditional build logic to skip Groups 1-4 when enabled
|
||||
- [x] Updated usage() documentation
|
||||
- [x] Tested successfully: skips Groups 1-4, builds Group 5 Viewer targets
|
||||
- [x] Validated non-ArcGIS Viewer targets build without errors
|
||||
- [x] **KDReports Integration for LtsReportDisplay**
|
||||
- [x] Fixed FindKDReports.cmake to use CONFIG mode with explicit search paths
|
||||
- [x] Added KDReports build from source to Dockerfile (apt package unavailable)
|
||||
- [x] Fixed KDReports git clone branch name (removed non-existent branch reference)
|
||||
- [x] Added symlink KDReports -> KDReports-qt6 for include path compatibility
|
||||
- [x] Added BUILD_CODIFICATION support to new_docker_build.sh
|
||||
- [x] LtsReportDisplay now builds successfully with codification support
|
||||
- [x] **LtsFileDialog Exclusion from Viewer-Only Builds**
|
||||
- [x] LtsFileDialog depends on Group 4 services (svcExmCommon, svcOpmCommon, svcFlmCommon)
|
||||
- [x] Updated new_docker_build.sh to conditionally exclude LtsFileDialog when BUILD_VIEWER_ONLY=ON
|
||||
- [x] **USE_PREBUILT_IMAGE Flag Fix**
|
||||
- [x] Fixed premature DOCKER_IMAGE assignment before argument parsing
|
||||
- [x] Container now correctly uses prebuilt image with cmake available
|
||||
|
||||
### Pending
|
||||
- [ ] Docker build validation with BUILD_ARCGIS=ON for advancedSymbology target (requires ArcGIS SDK setup)
|
||||
- [x] CTest execution in Docker container (viewer-only tests) - LtsDataViewTest PASSED
|
||||
- [x] Jenkins/policy compatibility verification - No changes required
|
||||
- [x] BUILD_GRANTLEE usage verification in all Viewer CMakeLists.txt files
|
||||
- [ ] Fix Group 4 svcExmCommon 'Database' namespace error to enable LtsFileDialog build
|
||||
- [ ] Docker build validation with `--group5` option
|
||||
- [ ] CTest execution in Docker container
|
||||
- [ ] Jenkins/policy compatibility verification
|
||||
- [ ] Full source file migration review (beyond initial grep)
|
||||
- [ ] BUILD_GRANTLEE usage verification in all Viewer CMakeLists.txt files
|
||||
|
||||
## Known Issues
|
||||
|
||||
### Build Blockers (Pre-existing, not Qt6 migration related)
|
||||
1. **ProjectDataManagement/svcPdmClient (Group 3)**: Build errors prevent reaching Group 5
|
||||
- Missing 'Ftc' class
|
||||
- 'tr_lts' undefined
|
||||
- Interface implementation mismatches
|
||||
- **Impact**: Full GROUP5 build with dependencies cannot complete
|
||||
|
||||
2. **ExerciseManagement/svcExmCommon (Group 4)**: Missing 'Database' namespace
|
||||
- **Impact**: LtsFileDialog cannot build when full dependency chain is included
|
||||
|
||||
3. **LtsReportDisplay**: ~~KDReports dependency not found~~ - **RESOLVED**
|
||||
- ~~**Impact**: Target skipped in build configuration~~
|
||||
- **Fix**: Added symlink KDReports -> KDReports-qt6 in Dockerfile for include path compatibility
|
||||
- **Status**: Now builds successfully with codification support
|
||||
|
||||
4. **advancedSymbology**: Requires ArcGIS Runtime SDK headers
|
||||
- Missing: Symbol.h, DictionarySymbolStyle.h
|
||||
- **Impact**: Cannot validate ArcGIS-dependent Viewer target without SDK setup
|
||||
|
||||
### Workarounds
|
||||
- ✓ Use `--build-viewer-only` option to skip Groups 1-4 and build Viewer targets directly
|
||||
- ✓ Viewer module code changes validated in partial builds (BUILD_ARCGIS=OFF)
|
||||
- ✓ No Qt6 deprecation warnings in validated targets
|
||||
- ✓ KDReports include path issue resolved with symlink in Dockerfile
|
||||
- ✓ LtsReportDisplay now builds successfully with codification support
|
||||
- Full integration build requires fixing Group 3/4 pre-existing errors or using `--build-viewer-only`
|
||||
|
||||
## Qt6 API Migration Details
|
||||
|
||||
### Files Modified for Qt6 Compatibility
|
||||
|
||||
**SituationMap/Map/**
|
||||
- `situation_map_types.h` - Added `#include <utility>`, fixed `qAsConst`
|
||||
- `operator_map_settings.cpp` - Added `#include <utility>`, fixed `qAsConst`
|
||||
- `map_initializer.cpp` - Added `#include <utility>`, fixed 4 `qAsConst` occurrences
|
||||
|
||||
**SituationMap/SymbologyImpl/**
|
||||
- `esri_dictionary_processor.cpp` - Fixed `QStringRef→split()`, `qAsConst`
|
||||
- `esri_dictionary_processor_app6.cpp` - Fixed `qAsConst`, `QStringRef→split()`
|
||||
- `esri_dictionary_processor_app6d.cpp` - Fixed `qAsConst`, `QStringRef→split()`
|
||||
- `esri_dictionary_processor_mil2525d.cpp` - Fixed `qAsConst`, `QStringRef→split()`
|
||||
- `base_symbol_model.h` - Removed `arcgis/` prefix from includes
|
||||
- `base_symbol_model.cpp` - Removed `arcgis/` prefix from includes
|
||||
- `symbol_dictionary_impl.cpp` - Fixed `QStringView` constructor, removed `arcgis/` prefix
|
||||
- `esri_dictionary_processor.h` - Removed `arcgis/` prefix from includes
|
||||
|
||||
**SituationMap/Symbology/**
|
||||
- `sidc_codec.h` - Replaced `QStringRef` with `QStringView`
|
||||
- `symbol_properties.cpp` - Fixed `QStringView` with `.slice()`, `count()→size()`
|
||||
- `sidc_builder.cpp` - Fixed 11 `QStringView` 3-arg constructor calls
|
||||
- `sidc_builder_base.cpp` - Fixed 2 `QStringView` 3-arg constructor calls
|
||||
- `xml_symbol_codec.h` - Fixed `split()` return type to `auto`
|
||||
|
||||
**Build System**
|
||||
- `new_docker_build.sh` - Docker/ArcGIS path fixes
|
||||
- `install_arcgis.sh` - Docker workspace paths
|
||||
- `cmake/FindArcGIS.cmake` - Header path detection
|
||||
- `Lts/Viewer/LtsDataView/CMakeLists.txt` - Added CTest registration
|
||||
- `Lts/Viewer/LtsFileDialog/CMakeLists.txt` - Added CTest registration
|
||||
None identified at this stage. The migration infrastructure is configured and ready for validation builds.
|
||||
|
||||
## Next Steps
|
||||
|
||||
1. **✓ Resolve Group 3/4 Build Errors** (Pre-existing, not Qt6 migration related)
|
||||
- ✓ Workaround implemented: `--build-viewer-only` option skips Groups 1-4
|
||||
- ✓ Viewer module validated without Group 3/4 dependencies
|
||||
- ⚠ Optional: Fix ProjectDataManagement/svcPdmClient and ExerciseManagement/svcExmCommon for full build
|
||||
|
||||
2. **✓ Docker Validation Build without ArcGIS** (COMPLETED)
|
||||
- ✓ Validated with: `BUILD_RTI=ON BUILD_GRANTLEE=ON BUILD_CODIFICATION=ON ./new_docker_build.sh --build-viewer-only --no-arcgis`
|
||||
- ✓ situationMapCommon: Built successfully (no Qt6 warnings)
|
||||
- ✓ advancedSymbologyXML: Built successfully (no Qt6 warnings)
|
||||
- ✓ LtsDataView: Built successfully (no Qt6 warnings)
|
||||
- ✓ LtsReportDisplay: Built successfully with codification support (no Qt6 warnings)
|
||||
- ✓ No Qt5→Qt6 deprecation warnings in Viewer module
|
||||
- ✓ KDReports include path fixed via symlink (KDReports -> KDReports-qt6)
|
||||
- ✓ FindKDReports.cmake updated to use CONFIG mode with /usr/local paths
|
||||
|
||||
3. **Docker Validation Build with ArcGIS**
|
||||
1. **Docker Validation Build**
|
||||
```bash
|
||||
cd qt-migration-legatus/qt6-after/qt6-migrated-legatus
|
||||
BUILD_RTI=ON BUILD_GRANTLEE=ON BUILD_ARCGIS=ON ./new_docker_build.sh --build-viewer-only
|
||||
BUILD_RTI=ON BUILD_GRANTLEE=ON ./new_docker_build.sh --group5
|
||||
```
|
||||
- Validate advancedSymbology target with ArcGIS Runtime SDK
|
||||
- Requires ArcGIS SDK headers at /workspace/external/ArcGIS/MapsSDK_Qt_300.0.0/...
|
||||
|
||||
4. **✓ CTest Execution** (COMPLETED)
|
||||
- ✓ LtsDataViewTest: PASSED (1.04 sec) with headless execution (QT_QPA_PLATFORM=offscreen)
|
||||
- ✓ LtsFileDialogTest: Excluded from viewer-only builds (requires Group 4 dependencies)
|
||||
- ✓ Test auto-exit implemented with QTimer::singleShot to prevent hangs
|
||||
- ✓ No test failures in Viewer module
|
||||
2. **CTest Execution**
|
||||
- Verify LtsDataViewTest runs successfully
|
||||
- Verify LtsFileDialogTest runs successfully
|
||||
- Check test output for any failures
|
||||
|
||||
5. **✓ Jenkins Compatibility**
|
||||
- ✓ Test names follow existing patterns (LtsDataViewTest, LtsFileDialogTest)
|
||||
- ✓ CTest registration uses standard NGL_ADD_EXECUTABLE macro
|
||||
- ✓ No ci/ changes required for viewer-only builds
|
||||
3. **Jenkins Compatibility**
|
||||
- Verify `ci/check_pr_policies.py` accepts new test names
|
||||
- Check `ci/Dockerfile.*` for any required updates
|
||||
|
||||
6. **✓ Migration Completion**
|
||||
- ✓ Code migration: Complete
|
||||
- ✓ Docker validation (non-ArcGIS): Complete
|
||||
- ✓ LtsReportDisplay with KDReports: Complete
|
||||
- ✓ CTest execution: Complete (LtsDataViewTest passes)
|
||||
- ⚠ Docker validation (ArcGIS): Pending SDK setup (optional, requires ArcGIS license)
|
||||
- ✓ Document final status and any remaining limitations
|
||||
4. **Source File Review**
|
||||
- Deep inspection of SituationMap subdirectories
|
||||
- Verify all Qt5→Qt6 API migrations are complete
|
||||
- Check for any remaining deprecated API usage
|
||||
|
||||
## Files Modified
|
||||
|
||||
### Build System
|
||||
1. `qt6-after/qt6-migrated-legatus/new_docker_build.sh` (+49 lines) - GROUP5, BUILD_GRANTLEE, ArcGIS paths, BUILD_CODIFICATION, --build-viewer-only, LtsFileDialog exclusion
|
||||
2. `qt6-after/qt6-migrated-legatus/install_arcgis.sh` - Docker workspace paths
|
||||
3. `qt6-after/qt6-migrated-legatus/cmake/FindArcGIS.cmake` - Header path detection
|
||||
4. `qt6-after/qt6-migrated-legatus/cmake/FindKDReports.cmake` - CONFIG mode with explicit search paths, KDReports-qt6 detection
|
||||
5. `qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/CMakeLists.txt` (+5 lines) - CTest registration
|
||||
6. `qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsFileDialog/CMakeLists.txt` (+5 lines) - CTest registration
|
||||
7. `app/Dockerfile` - KDReports build from source, symlink KDReports -> KDReports-qt6 for include path compatibility
|
||||
|
||||
### Qt6 API Migration (Viewer Module)
|
||||
6. `Lts/Viewer/SituationMap/Map/situation_map_types.h` - `#include <utility>`, `qAsConst`
|
||||
7. `Lts/Viewer/SituationMap/Map/operator_map_settings.cpp` - `#include <utility>`, `qAsConst`
|
||||
8. `Lts/Viewer/SituationMap/Map/map_initializer.cpp` - `#include <utility>`, 4× `qAsConst`
|
||||
9. `Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor.cpp` - `QStringRef→split()`, `qAsConst`
|
||||
10. `Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor_app6.cpp` - `qAsConst`, `QStringRef→split()`
|
||||
11. `Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor_app6d.cpp` - `qAsConst`, `QStringRef→split()`
|
||||
12. `Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor_mil2525d.cpp` - `qAsConst`, `QStringRef→split()`
|
||||
13. `Lts/Viewer/SituationMap/SymbologyImpl/base_symbol_model.h` - ArcGIS include paths
|
||||
14. `Lts/Viewer/SituationMap/SymbologyImpl/base_symbol_model.cpp` - ArcGIS include paths
|
||||
15. `Lts/Viewer/SituationMap/SymbologyImpl/symbol_dictionary_impl.cpp` - `QStringView`, ArcGIS includes
|
||||
16. `Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor.h` - ArcGIS include paths
|
||||
17. `Lts/Viewer/SituationMap/Symbology/sidc_codec.h` - `QStringRef→QStringView`
|
||||
18. `Lts/Viewer/SituationMap/Symbology/symbol_properties.cpp` - `QStringView.slice()`, `count()→size()`
|
||||
19. `Lts/Viewer/SituationMap/Symbology/sidc_builder.cpp` - 11× `QStringView` 3-arg constructor
|
||||
20. `Lts/Viewer/SituationMap/Symbology/sidc_builder_base.cpp` - 2× `QStringView` 3-arg constructor
|
||||
21. `Lts/Viewer/SituationMap/SymbologyXML/xml_symbol_codec.h` - `split()` return type
|
||||
1. `qt6-after/qt6-migrated-legatus/new_docker_build.sh` (+49 lines)
|
||||
2. `qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsDataView/CMakeLists.txt` (+5 lines)
|
||||
3. `qt6-after/qt6-migrated-legatus/Lts/Viewer/LtsFileDialog/CMakeLists.txt` (+5 lines)
|
||||
|
||||
## Commit Reference
|
||||
|
||||
### Initial Infrastructure (commit cdb8c754e)
|
||||
```
|
||||
Add GROUP5 build configuration and CTest registration for Viewer module
|
||||
commit cdb8c754e
|
||||
Author: [Your Name]
|
||||
Date: [Current Date]
|
||||
|
||||
- Add GROUP5_TARGETS array with 7 Viewer module targets to new_docker_build.sh
|
||||
- Add BUILD_GRANTLEE support throughout build script
|
||||
- Register LtsDataViewTest and LtsFileDialogTest with CTest
|
||||
|
||||
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
||||
```
|
||||
|
||||
### Qt6 API Migration (multiple commits)
|
||||
```
|
||||
Migrate Qt5 APIs to Qt6 in Viewer module
|
||||
|
||||
- Replace qAsConst() with std::as_const() (10+ files)
|
||||
- Replace QStringRef with QStringView (10+ files)
|
||||
- Fix QStringView 3-arg constructor → .slice() pattern (13 occurrences)
|
||||
- Replace QString::splitRef() with split()
|
||||
- Replace QString::count() with size()
|
||||
- Add #include <utility> for std::as_const
|
||||
|
||||
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
||||
```
|
||||
|
||||
### ArcGIS Integration (multiple commits)
|
||||
```
|
||||
Fix ArcGIS Runtime SDK integration for Docker builds
|
||||
|
||||
- Update new_docker_build.sh with correct install_arcgis.sh path
|
||||
- Update install_arcgis.sh with Docker workspace paths (/workspace/external)
|
||||
- Fix FindArcGIS.cmake header path detection
|
||||
- Remove arcgis/ prefix from includes (flat include directory structure)
|
||||
- Remove problematic arcgis symlink
|
||||
|
||||
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
||||
```
|
||||
|
||||
### KDReports Support (latest commits)
|
||||
```
|
||||
Add KDReports support for LtsReportDisplay with codification
|
||||
|
||||
- Update FindKDReports.cmake to use CONFIG mode with explicit search paths
|
||||
- Fix new_docker_build.sh: add BUILD_CODIFICATION, exclude LtsFileDialog from viewer-only builds
|
||||
- Add KDReports build from source to Dockerfile (apt package unavailable)
|
||||
- Create symlink KDReports -> KDReports-qt6 for include path compatibility
|
||||
- Validate viewer-only build with codification: LtsReportDisplay and LtsDataView build successfully
|
||||
|
||||
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
||||
Add GROUP5 build configuration and CTest registration for Viewer module
|
||||
|
||||
- Add GROUP5_TARGETS array with 7 Viewer module targets to new_docker_build.sh
|
||||
- Add BUILD_GRANTLEE support throughout build script (help, env vars, cmake invocation)
|
||||
- Fix duplicate BUILD_GROUP4 default in container script section
|
||||
- Register LtsDataViewTest with CTest in LtsDataView/CMakeLists.txt
|
||||
- Register LtsFileDialogTest with CTest in LtsFileDialog/CMakeLists.txt
|
||||
- Update help text to document --group5/--no-group5 and --grantlee/--no-grantlee options
|
||||
- Set BUILD_GROUP5=OFF and BUILD_GRANTLEE=ON as defaults
|
||||
|
||||
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
**Report Generated**: $(date)
|
||||
**Migration Phase**: Code Migration Complete ✓
|
||||
**Build Status**: Viewer module validated (BUILD_ARCGIS=OFF), full integration blocked by Group 3/4 pre-existing errors
|
||||
**Next Phase**: Resolve Group 3/4 dependencies or build Viewer targets directly in Docker
|
||||
**Migration Phase**: Infrastructure Configuration Complete
|
||||
**Next Phase**: Docker Validation and Testing
|
||||
@@ -98,10 +98,6 @@ RUN set -eux; \
|
||||
apt-get install -y --no-install-recommends libgtest-dev libgmock-dev || true; \
|
||||
# Build KDReports via script in /app if apt packages not available
|
||||
/app/build_kdreports.sh || true; \
|
||||
# Create KDReports symlink for compatibility (KDReports-qt6 -> KDReports)
|
||||
if [ -d /usr/local/include/KDReports-qt6 ] && [ ! -d /usr/local/include/KDReports ]; then \
|
||||
ln -s KDReports-qt6 /usr/local/include/KDReports; \
|
||||
fi; \
|
||||
# If libgtest-dev provided sources, build+install them via script
|
||||
/app/build_gtest.sh || true; \
|
||||
# geographiclib already installed via apt; RTI and ArcGIS are proprietary and installed externally
|
||||
|
||||
@@ -0,0 +1,404 @@
|
||||
# Strict Qt6 Migration Prompt: CMake targets in predefined folders:
|
||||
|
||||
./Lts/Tools/DBAdministration
|
||||
./Lts/Tools/DBOperatorSettingsRemover
|
||||
./Lts/Tools/DBUpdate
|
||||
./Lts/Tools/DataSampleGenerator
|
||||
./Lts/Tools/DataSampleReceiver
|
||||
./Lts/Tools/DateTimeSyncer
|
||||
./Lts/Tools/DdsView
|
||||
./Lts/Tools/DotMatrixDisplay
|
||||
./Lts/Tools/LicenceEditor
|
||||
./Lts/Tools/LocalDomainFinder
|
||||
./Lts/Tools/LogViewer
|
||||
|
||||
This prompt is binding task context. Keep changes minimal, scoped, and reproducible.
|
||||
|
||||
## Required base prompt
|
||||
|
||||
Before making changes, read and apply:
|
||||
|
||||
- ./prompts/combined-migration-subfolder-rti-compact.prompt.md
|
||||
- ./prompts/combined-migration-compact.prompt.md
|
||||
|
||||
If these prompts are stricter, follow them. This prompt overrides them only for build variants: use ON variants only. Do not pursue OFF variants.
|
||||
|
||||
## Module in scope
|
||||
|
||||
Migrate only:
|
||||
|
||||
- cmake targets under these predefined folders:
|
||||
|
||||
./Lts/Tools/DBAdministration
|
||||
./Lts/Tools/DBOperatorSettingsRemover
|
||||
./Lts/Tools/DBUpdate
|
||||
./Lts/Tools/DataSampleGenerator
|
||||
./Lts/Tools/DataSampleReceiver
|
||||
./Lts/Tools/DateTimeSyncer
|
||||
./Lts/Tools/DdsView
|
||||
./Lts/Tools/DotMatrixDisplay
|
||||
./Lts/Tools/LicenceEditor
|
||||
./Lts/Tools/LocalDomainFinder
|
||||
./Lts/Tools/LogViewer
|
||||
|
||||
From:
|
||||
|
||||
- ./qt-migration-legatus/qt5-before/qt5-legatus-legacy
|
||||
|
||||
To:
|
||||
|
||||
- ./qt-migration-legatus/qt6-after/qt6-migrated-legatus
|
||||
|
||||
Do not migrate sibling tools or unrelated modules.
|
||||
|
||||
## Mandatory build variants
|
||||
|
||||
Only these variants are valid:
|
||||
|
||||
- BUILD_RTI=ON
|
||||
- BUILD_GRANTLEE=ON
|
||||
- BUILD_ARCGIS=OFF
|
||||
- BUILD_ARCGIS=ON
|
||||
|
||||
Forbidden:
|
||||
|
||||
- BUILD_RTI=OFF
|
||||
- BUILD_GRANTLEE=OFF
|
||||
|
||||
Rules:
|
||||
|
||||
- Do not implement, fix, preserve, test, or validate OFF variants.
|
||||
- Do not add CMake logic, tests, stubs, or fallbacks for OFF variants.
|
||||
- Do not report OFF variants as supported or partially supported.
|
||||
- Validation must use BUILD_RTI=ON and BUILD_GRANTLEE=ON and BUILD_ARCGIS=ON.
|
||||
|
||||
## Branches and trees
|
||||
|
||||
Qt6 target branch:
|
||||
|
||||
- feature/migrate-lts-tools-d-and-l
|
||||
|
||||
Qt5 legacy branch, if comparison is needed:
|
||||
|
||||
- story/qt6-migration
|
||||
|
||||
Legacy source tree:
|
||||
|
||||
- ./qt-migration-legatus/qt5-before/qt5-legatus-legacy
|
||||
|
||||
Qt6 target tree:
|
||||
|
||||
- ./qt-migration-legatus/qt6-after/qt6-migrated-legatus
|
||||
|
||||
Work in the Qt6 target tree only. Do not modify the Qt5 legacy tree.
|
||||
|
||||
## Scope rules
|
||||
|
||||
Touch files outside the targets directories only when directly required to configure, generate, build, link, test, or validate these services.
|
||||
|
||||
Allowed outside-scope changes:
|
||||
|
||||
- parent CMakeLists.txt entries for these services
|
||||
- central CMake helper fixes required by these services
|
||||
- shared include path fixes required by these services
|
||||
- RTI, codegen, ndsgen, KTextTemplate, or Grantlee integration fixes required by these services
|
||||
- test infrastructure needed by tests for these services
|
||||
- new_docker_build.sh changes needed to run those tests
|
||||
- minimal Jenkins CI discovery or policy updates needed for those tests
|
||||
- relocation of required stubs or forward declarations to allowed directories
|
||||
|
||||
Not allowed:
|
||||
|
||||
- restoring removed modules
|
||||
- reintroducing stale dependencies on removed modules
|
||||
- removing or disabling active modules to hide failures
|
||||
- disabling targets instead of fixing root causes
|
||||
- broad refactoring, cleanup, renaming, or modernization
|
||||
- warning suppression instead of fixing causes
|
||||
- committing generated files
|
||||
- consuming generated outputs from the source tree
|
||||
- fake success, dummy files, handwritten generated replacements, mocks, placeholders, or generated-output stubs
|
||||
|
||||
## CMake targets
|
||||
|
||||
- under folder ./qt-migration-legatus/qt6-after/qt6-migrated-legatus/
|
||||
|
||||
./Lts/Tools/DBAdministration
|
||||
./Lts/Tools/DBOperatorSettingsRemover
|
||||
./Lts/Tools/DBUpdate
|
||||
./Lts/Tools/DataSampleGenerator
|
||||
./Lts/Tools/DataSampleReceiver
|
||||
./Lts/Tools/DateTimeSyncer
|
||||
./Lts/Tools/DdsView
|
||||
./Lts/Tools/DotMatrixDisplay
|
||||
./Lts/Tools/LicenceEditor
|
||||
./Lts/Tools/LocalDomainFinder
|
||||
./Lts/Tools/LogViewer
|
||||
|
||||
- Discover real CMake targets defined in the predefined folders.
|
||||
- Learn options of script ./qt-migration-legatus/qt6-after/qt6-migrated-legatus/new_docker_build.sh to improve peformance of migration process
|
||||
- Reuse prebuilt migration image as much as possible
|
||||
- Add every required CMake target to ./qt-migration-legatus/qt6-after/qt6-migrated-legatus/new_docker_build.sh so the validation container builds or validates it.
|
||||
- Add new --group6 option for required CMake targets
|
||||
- Add required apt packages to new_docker_build.sh
|
||||
- Do not invent CMake targets under perdefined folders.
|
||||
- Do not add targets that do not exist.
|
||||
- If a folder does not exist, has no CMake targets, or a target is intentionally out of scope, report that fact and the reason.
|
||||
- Do not weaken validation to make CMake targets under predefined folders pass.
|
||||
|
||||
## Preservation rules
|
||||
|
||||
Preserve module removals from commit:
|
||||
|
||||
- 92ad7d468, "remove all unneeded module listed from Niklas"
|
||||
|
||||
Do not restore removed modules, files, targets, directories, or dependencies.
|
||||
|
||||
Preserve LogViewer reinsert from commit:
|
||||
|
||||
- 1fa789767, "Added LogViewer again"
|
||||
|
||||
Do not remove, disable, or break LogViewer integration.
|
||||
|
||||
Preserve prior IDL warning fixes from commit:
|
||||
|
||||
- be912de9d, "Removes .IDL warnings: multiple enum definitons and builtin-type collisions"
|
||||
|
||||
Do not blindly replay that commit. Use it only as reference. Do not reintroduce removed modules.
|
||||
|
||||
IDL regressions to avoid:
|
||||
|
||||
- multiple enum definitions
|
||||
- duplicate enumerators
|
||||
- builtin type or keyword collisions
|
||||
|
||||
Check first for duplicate inputs, stale paths, removed-module references, source-tree generated outputs, source/build-tree confusion, and repeated IDL definitions before treating an issue as semantic IDL conflict.
|
||||
|
||||
## Stubs and forward declarations
|
||||
|
||||
Any required existing stub, compatibility declaration, or forward declaration must live only under:
|
||||
|
||||
- ./qt-migration-legatus/qt6-after/qt6-migrated-legatus/forward-declarations/
|
||||
- ./qt-migration-legatus/qt6-after/qt6-migrated-legatus/include/
|
||||
|
||||
Rules:
|
||||
|
||||
- Do not leave such files in service directories unless they are real service source files.
|
||||
- Do not create or keep stubs for forbidden OFF variants.
|
||||
- Do not use stubs or forward declarations as replacements for real RTI, ndsgen, KTextTemplate, or Grantlee outputs in ON builds.
|
||||
- Report every moved, removed, or newly referenced stub/forward declaration.
|
||||
|
||||
## Migration checks
|
||||
|
||||
For each cmake target, inspect and migrate only as needed:
|
||||
|
||||
- source and header files
|
||||
- CMakeLists.txt and parent CMake registration
|
||||
- ui, qrc, resource, plugin, and service metadata
|
||||
- RTI IDL, ndsgen, KTextTemplate, and Grantlee inputs/templates
|
||||
- tests directly tied to these services
|
||||
|
||||
Fix only real Qt6/C++17 build issues, such as:
|
||||
|
||||
- Qt module imports and target links
|
||||
- moc, uic, and rcc handling
|
||||
- QRegExp to QRegularExpression when required
|
||||
- QTextCodec replacement when required
|
||||
- QDesktopWidget or QApplication::desktop() replacement when required
|
||||
- QString, QVariant, QMetaType, QDateTime, QAction, QMenu, signal/slot, enum, plugin, or metadata compatibility issues when required
|
||||
|
||||
No opportunistic refactoring or style cleanup.
|
||||
|
||||
## Qt link rules
|
||||
|
||||
No active target in the Qt6 tree may link Qt5 imported targets.
|
||||
|
||||
Search for and fix active uses of:
|
||||
|
||||
- Qt5::
|
||||
- find_package(Qt5
|
||||
- QT5_
|
||||
- Qt5Core
|
||||
- Qt5Widgets
|
||||
- Qt5Network
|
||||
|
||||
Use Qt6 equivalents. Prefer central CMake helper fixes when the issue is central.
|
||||
|
||||
## Code generation rules
|
||||
|
||||
If generated files are required:
|
||||
|
||||
- reconstruct the real legacy generation flow
|
||||
- generate into the build tree
|
||||
- consume from the build tree
|
||||
- list complete OUTPUT and BYPRODUCTS
|
||||
- set correct DEPENDS and MAIN_DEPENDENCY where useful
|
||||
- use deterministic WORKING_DIRECTORY
|
||||
- use VERBATIM
|
||||
- wire generated sources with target_sources
|
||||
- wire generated include dirs with target_include_directories
|
||||
- ensure compilation depends on generation
|
||||
- ensure incremental rebuilds trigger on input/template changes
|
||||
|
||||
Never commit generated .idl, .h, .hpp, or .cpp outputs. Never consume generated outputs from the source tree. Never fabricate generated outputs.
|
||||
|
||||
## Tests
|
||||
|
||||
For every C++ code change, add three meaningful CTest tests where feasible.
|
||||
|
||||
Rules:
|
||||
|
||||
- tests must validate changed behavior, not only compilation
|
||||
- tests must be registered with CTest
|
||||
- tests must run with BUILD_RTI=ON and BUILD_GRANTLEE=ON and BUILD_ARCGIS=ON
|
||||
- do not add OFF-variant tests
|
||||
- use deterministic tests without host-local paths
|
||||
- if three meaningful tests are impossible, add the maximum meaningful set and explain why
|
||||
- ./qt-migration-legatus/qt6-after/qt6-migrated-legatus/new_docker_build.sh changes needed to run those tests
|
||||
- ./qt-migration-legatus/qt6-after/qt6-migrated-legatus/new_docker_build.sh changes needed to build or validate required CMake targets under folder ./qt-migration-legatus/qt6-after/qt6-migrated-legatus/Lts/Viewer
|
||||
|
||||
Preferred location:
|
||||
|
||||
- ./qt-migration-legatus/qt6-after/qt6-migrated-legatus/tests
|
||||
|
||||
Use policy-compatible names, for example:
|
||||
|
||||
- test_<name>.cpp
|
||||
- <name>_test.cpp
|
||||
- <name>test.cpp
|
||||
- <name>gtest.cpp
|
||||
|
||||
## Docker and CI
|
||||
|
||||
Authoritative migration Dockerfile:
|
||||
|
||||
- ./app/Dockerfile
|
||||
|
||||
Authoritative validation script:
|
||||
|
||||
- ./qt-migration-legatus/qt6-after/qt6-migrated-legatus/new_docker_build.sh
|
||||
|
||||
Do not use other Dockerfiles as task authority.
|
||||
|
||||
Validation container expectations:
|
||||
|
||||
- repository root at /repo, or the script's documented mount path
|
||||
- external dependencies under /repo/external, or the script's documented equivalent
|
||||
- RTI 7.7 at /repo/external/rti_connext_dds-7.7.0, or documented equivalent
|
||||
- ./rti_license.dat mounted read-only if RTI requires it
|
||||
- no developer-local paths
|
||||
|
||||
Jenkins CI must be able to discover and run the new tests, or verify that new_docker_build.sh runs them. Inspect and minimally update only if needed:
|
||||
|
||||
- ./qt-migration-legatus/ci/Dockerfile.*
|
||||
- ./qt-migration-legatus/ci/check_pr_policies.py
|
||||
|
||||
### External dependencies to be mapped into Docker container
|
||||
- `./external`
|
||||
- expected subfolders:
|
||||
- `./external/ArcGIS`
|
||||
- `./external/GeographicLib`
|
||||
- `./external/rti_connext_dds-7.7.0`
|
||||
|
||||
### RTI license
|
||||
- `./rti_license.dat`
|
||||
|
||||
## Required procedure
|
||||
|
||||
1. Inspect repository state, branch, working tree, submodules, required prompts, service paths, and forward-declaration directories.
|
||||
2. Compare Qt5 source services with Qt6 targets. Classify files as already migrated, missing, stale, generated, intentionally removed, build-only, or needing Qt6 adaptation.
|
||||
3. Identify dependencies, generated inputs, Qt modules, parent CMake entries, removed-module references, LogViewer interactions, and required stub/forward-declaration relocations.
|
||||
4. Apply the smallest valid migration changes.
|
||||
5. Add required CTest tests for C++ changes.
|
||||
6. Review RTI, ndsgen, KTextTemplate, and Grantlee generation paths.
|
||||
7. Check regressions: Qt5 links, removed modules, LogViewer, IDL warnings, source-tree generated consumption, stale artifacts, and misplaced stubs.
|
||||
8. Validate in Docker with BUILD_RTI=ON and BUILD_GRANTLEE=ON.
|
||||
9. Run CTest in the validated build directory.
|
||||
10. Check Jenkins/policy compatibility.
|
||||
11. Report factual status.
|
||||
|
||||
Do not overwrite uncommitted user changes. If they block safe work, report the blocker.
|
||||
|
||||
## Required validation
|
||||
|
||||
From:
|
||||
|
||||
- ./qt-migration-legatus/qt6-after/qt6-migrated-legatus
|
||||
|
||||
Run:
|
||||
|
||||
```bash
|
||||
BUILD_RTI=ON BUILD_GRANTLEE=ON BUILD_ARCGIS=ON ./new_docker_build.sh
|
||||
```
|
||||
|
||||
CTest must run as part of validation. If a direct clean build is useful, use:
|
||||
|
||||
```bash
|
||||
cmake -S /repo/qt-migration-legatus/qt6-after/qt6-migrated-legatus -B /repo/build-rti-on-grantlee-on -G Ninja -DCMAKE_BUILD_TYPE=Debug -DBUILD_RTI=ON -DBUILD_GRANTLEE=ON -DBUILD_ARCGIS=ON
|
||||
cmake --build /repo/build-rti-on-grantlee-on --parallel
|
||||
ctest --test-dir /repo/build-rti-on-grantlee-on --output-on-failure
|
||||
```
|
||||
|
||||
Also check whether this file exists and run it only if present:
|
||||
|
||||
```bash
|
||||
./new_docker-build.h
|
||||
```
|
||||
|
||||
If it is absent or a typo, report that. Do not invent a replacement.
|
||||
|
||||
Do not run or validate OFF variants.
|
||||
|
||||
## Success criteria
|
||||
|
||||
Success requires:
|
||||
|
||||
- cmake targets migrated or confirmed already correct
|
||||
- cmake targets included in the Qt6 build
|
||||
- configure, build, and CTest pass with BUILD_RTI=ON and BUILD_GRANTLEE=ON and BUILD_ARCGIS=ON
|
||||
- new_docker_build.sh runs the relevant tests and fails on test failure
|
||||
- Jenkins/policy discovery accepts the new tests and validation changes
|
||||
- no active Qt5 imported target links remain for these services
|
||||
- generated outputs are build-tree only and freshly produced when required
|
||||
- no generated outputs are committed or consumed from the source tree
|
||||
- no fake generated files, dummy files, mocks, placeholders, or stubbed generated outputs exist
|
||||
- required stubs/forward declarations are only in allowed directories
|
||||
- removed modules remain removed
|
||||
- LogViewer remains preserved
|
||||
- RTI/codegen and Grantlee/KTextTemplate success is real, not stale or faked
|
||||
|
||||
## If blocked
|
||||
|
||||
Do not fake success. Report:
|
||||
|
||||
- failing command
|
||||
- key error output
|
||||
- affected service
|
||||
- category: project, path, merge, CMake, Qt API, codegen, Docker, RTI/license, Grantlee/KTextTemplate, ArcGIS, test, CTest, Jenkins CI, stub relocation, or environment
|
||||
- what was fixed safely
|
||||
- what remains blocked
|
||||
- whether stale artifacts were ruled out
|
||||
- whether generated files were involved
|
||||
- exact missing files, targets, or generator step
|
||||
- whether tests and CTest integration succeeded
|
||||
- whether Docker validation and Jenkins discovery succeeded
|
||||
|
||||
## Final report
|
||||
|
||||
Keep it short. Include:
|
||||
|
||||
- status: validated, partially validated, or blocked
|
||||
- cmake targets under predefined folders migrated or already correct
|
||||
- files changed
|
||||
- C++ files changed
|
||||
- tests added per C++ change
|
||||
- CTest registration changes
|
||||
- CMake and generator changes
|
||||
- stub/forward-declaration moves or removals
|
||||
- Docker and Jenkins CI changes
|
||||
- Qt5 references removed or remaining
|
||||
- confirmation that removed modules were not restored
|
||||
- confirmation that LogViewer was preserved
|
||||
- exact validation commands and results
|
||||
- result of new_docker-build.h if present
|
||||
- remaining blockers or risks
|
||||
+1
-1
Submodule qt-migration-legatus updated: c664611b80...9f0076a197.
Reference in new issue
Block a user