Repository navigation
Conversation
Add the unmodified include/tclap/ directory of tclap-1.2.5.tar.gz (SHA-256 bb649f76dae35e8d0dcba4b52acfd4e062d787e6a81b43f7a4b01275153165a6) with its MIT license, for the command-line parsing code of the dcmqi applications. tclap/README.md records the provenance; the README lists TCLAP and JsonCpp as the third-party code in the source tree. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
SlicerExecutionModel is under the 3D Slicer license, which Debian does not consider DFSG-free (Slicer/SlicerExecutionModel#159), and it was the only such dependency of dcmqi. Replace the parts dcmqi used with code written for dcmqi, without copying from SlicerExecutionModel: - apps/GenerateCLP/dcmqiGenerateCLP.cxx: build-time tool that reads an application's XML descriptor and writes <name>CLP.h with the PARSE_ARGS macro. It uses only the C++ standard library (no DCMTK, no Python) and accepts only the descriptor features dcmqi uses, failing the build on anything else. - apps/GenerateCLP/dcmqiCLP.h: runtime support shared by the generated headers, on top of the vendored TCLAP. - CMake/dcmqiMacroBuildCLI.cmake: replaces SEMMacroBuildCLI with the same targets (<name>Lib with main renamed ModuleEntryPoint, <name>, XML next to the executable) and honors the SlicerExecutionModel_DEFAULT_CLI_* variables that 3D Slicer sets for extension builds. The applications' sources and XML descriptors are unchanged, and so is their command-line behavior: --xml, --help, --echo, error messages and exit codes match dcmqi 1.5.7 on a corpus of 753 invocations. TCLAP_INCLUDE_DIR selects a system TCLAP instead of the vendored one. Add tests for the generator's rejection of unsupported descriptors and for the applications' --xml output and argument errors. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
ubuntu-latest now resolves to Ubuntu 26.04, for which actions/setup-python has no Python 3.10.11 build, so the job failed in its setup step before building anything. Pin the image that the job last passed on. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The cache save steps run only when steps.build.outcome is 'success', but no step had the id 'build', so the condition was never true and the DCMTK, ITK and zlib builds were never saved. Each run that missed the cache rebuilt them from scratch. Give the build steps that id. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
❌ The last analysis has failed. |
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
SlicerExecutionModel (SEM) is distributed under the 3D Slicer license. Debian does not consider that license DFSG-free (Slicer/SlicerExecutionModel#159). SEM is dcmqi's only dependency with this problem, so it is what keeps dcmqi out of Debian
main.This PR replaces the parts of SEM that dcmqi uses with code written for dcmqi. The applications' command-line interface does not change. The new code was written from the observed behavior of the dcmqi 1.5.7 binaries. Nothing was copied from SEM.
What changes
<name>CLP.h)apps/GenerateCLP/dcmqiGenerateCLP.cxx, a build-time tool that needs only the C++ standard library. Code shared by all generated headers is inapps/GenerateCLP/dcmqiCLP.h.tclap/.-DTCLAP_INCLUDE_DIR=<dir>builds against a system copy instead, e.g. Debian'slibtclap-dev.SEMMacroBuildCLICMake/dcmqiMacroBuildCLI.cmakeandCMake/dcmqiCLIExecutableWrapper.cxxUnchanged files. No application
.cxxor.xmlfile changes. The existing tests are also unchanged.Superbuild. The superbuild no longer builds SEM:
CMakeExternals/SlicerExecutionModel.cmakeis removed, andDCMQIConfig.cmakeno longer setsSlicerExecutionModel_DIR.Build targets.
dcmqiMacroBuildCLIcreates the same targets asSEMMacroBuildCLIdid:<name>Lib, withmainrenamed toModuleEntryPoint, so the test drivers link as before<name>executableSlicer extension builds. The macro reads the
SlicerExecutionModel_DEFAULT_CLI_*andSlicerExecutionModel_USE_UTF8variables that 3D Slicer sets. A Slicer extension build should therefore place the CLIs where it does today.Strict generator. The generator accepts only the descriptor features dcmqi uses. It fails the build on anything else:
A future XML edit therefore can't silently change behavior.
No Python or DCMTK. Python is not needed at build time or at runtime. The generator does not link DCMTK, so it also runs when DCMTK is built as shared libraries, as in Slicer extension builds on Windows.
Help layout. Upstream TCLAP wraps the usage block at 75 columns.
dcmqiCLP.hkeeps the one-argument-per-line layout of the current binaries.Verification (macOS arm64)
--help,--xml,--echo, short, long and combined flags, repeated flags, missing values, unknown flags, and invalid enum and integer values.itkimage2paramap.xmlanditkimage2segimage.xmlafter 1.5.7 (Support multiframe source images in SEG and PM conversion #558).--xmlprints each repository XML byte for byte.ctestpasses 111 of 111. That includes 30 new tests:--xmloutput, and an unknown flagNot yet verified (why this is a draft)
cli-modulesNotes for reviewers
find_package(DCMQI)branch in the apps'CMakeLists.txthas nodcmqiMacroBuildCLIor generator available, because neither is exported. If that mode is still used, the macro and the generator need to be exported, or the branch removed.CMakeExternals/*.cmake. Removing the SEM file therefore causes one dependency rebuild on Windows.ITK.cmakeleft as is.CMakeExternals/ITK.cmakestill setsKWSYS_USE_MD5, with a comment saying SEM requires it. The Linux and macOS cache keys hash that file, so the file is left alone here.🤖 Generated with Claude Code