Mount-independent GeographicLib rpath and DEB production fixes
- CMakeLists.txt: add a $ORIGIN-based CMAKE_BUILD_RPATH entry for the bundled GeographicLib (include/GeographicLib/lib), like the existing RTI entry. The imported GeographicLib target only contributed the absolute container mount path to the build RUNPATH, so binaries could not resolve libGeographicLib.so.26 outside the /repo mount. Verified: ddsview built and run in a container with a different mount prefix resolves it via $ORIGIN and starts (rc=0). - new_docker_build.sh: seed the DEB cmake with ARCGIS_INCLUDE_DIR / ARCGIS_LIBRARY (the staged source copy cannot resolve the ArcGIS SDK, which is a relative symlink to the pipeline root dangling after staging); retry the build-tree removal with a clear error when a concurrent build/IDE keeps the directory busy. - Dockerfile: add a late apt layer with devscripts + debhelper (debuild, dh) for the DEB flow; cached Qt/KDReports layers are preserved. - README.md: document that --run-coverage and --run-jenkins-builder are combinable (DEB step runs after the coverage collection).
This commit is contained in:
1 parent
f1f2c5eec8
commit
113d4ab5ed
4 files changed
+47
-11
No files matched your search
@@ -281,8 +281,10 @@ them as-is, or `chown` the directory on the host to edit/move it.
|
||||
|
||||
`--coverage-output-dir DIR` moves the report; `DIR` must be an absolute
|
||||
path under the pipeline root (relative values are ignored and the
|
||||
default above is used). The option is mutually exclusive with
|
||||
`--run-jenkins-builder`.
|
||||
default above is used). Combined with `--run-jenkins-builder`, the
|
||||
instrumented build + ctest + lcov collection run first and the DEB
|
||||
production runs afterwards — the DEB builds in its own staged directory
|
||||
and never touches the build tree, so the report is left intact.
|
||||
|
||||
## Manual commands (without the driver)
|
||||
|
||||
@@ -399,7 +401,7 @@ The main ones:
|
||||
| `--run-jenkins-builder` | off | produce the DEB packages (Step 4) |
|
||||
| `--package-output-dir DIR` | `./packages-out` | pass-through (see Step 4 note) |
|
||||
| `--lts-version / --project / --build-number / --build-tag` | `1.0` / `guez` / `1` / `manual-build` | package metadata |
|
||||
| `--run-coverage` | off | instrument with `-O0 --coverage`, run ctest, collect the lcov report (Step 6); mutually exclusive with `--run-jenkins-builder` |
|
||||
| `--run-coverage` | off | instrument with `-O0 --coverage`, run ctest, collect the lcov report (Step 6); combinable with `--run-jenkins-builder` (DEB step then runs afterwards) |
|
||||
| `--coverage-output-dir DIR` | `qt6-after/build/coverage/<project>/<os>` | report dir (inside the build tree) — only absolute paths under the pipeline root are honored (Step 6) |
|
||||
|
||||
Environment overrides: `BUILD_GROUP1/3/5/6`, `RUN_CTEST`, `TESTS_ONLY`,
|
||||
|
||||
Reference in new issue
Block a user