COMP: Drop the build-machine path from the installed vcl_where_root_dir.h - #6878
Open
hjmjohnson wants to merge 3 commits into
Open
hjmjohnson wants to merge 3 commits into
hjmjohnson wants to merge 3 commits into
Conversation
Code extracted from:
/Users/johnsonhj/src/vxl
at commit a0790d71400203bc3d3503196c00d69c43f71208 (itk-drop-vcl-where-root-dir).
* upstream-VXL: VXL 2026-09-20 (a0790d71)
Records the overlay commit whose content the preceding merge imported.
hjmjohnson
marked this pull request as ready for review
September 21, 2026 10:33
Contributor
|
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.
Advances the vendored VXL overlay past the removal of the
vcl_where_root_dirmechanism.include/ITK-6.0/vcl_where_root_dir.hrecorded the configuring machine's source directory and was installed, so every installed ITK published that path. With #6877 an install tree no longer references the machine that produced it.Overlay change: InsightSoftwareConsortium/vxl
for/itk-vxl-master-a0790d7.Why the mechanism could be removed
VCL_SOURCE_ROOT_DIRhad exactly one reader,testlib_root_dir(), and within the overlay the only callers of that function were its own tests, so it existed to test itself. ITK has no caller at all.The 71 files that do call
testlib_root_dir()in upstreamvxl/vxlare all undercontrib/, which the overlay does not carry. The removal is therefore overlay-only and is not proposed upstream.vcl/CMakeLists.txtpassed an install destination tovxl_configure_file, which is why the generated header was installed rather than staying in the build tree.Verification
Measured against bare
mainrather than asserted, because the forest checkout has unrelated pre-existing failures.mainctest -R "vnl|VNL|testlib|vcl"Wrapping/The 16 build failures and 7 test failures are name-for-name identical with and without this change, so none are attributable to it. They are stale remote-module wrapping breakage (
VariationalRegistration,IsotropicWavelets,BoneMorphometry,IOMeshMZ3) plusRUNS_LONGregistration tests on a loaded host.Installed tree, with #6877 applied: no file references the build tree or the source tree.
pre-commit run --all-filesexits 0.Pin and topology
The subtree was imported with
Modules/ThirdParty/VNL/UpdateFromUpstream.sh, so the history keeps the two-parent merge the ingest convention requires:The overlay commit was pushed directly to the fork as the new anchor rather than merged through a pull request there. Merging would have produced a merge commit with a different SHA, giving a second anchor candidate and invalidating this pin. Pushing directly keeps the overlay tip and the anchor the same object, matching the 7-character form the existing anchors use.
Depends on #6877 only for the combined result; the two changes are independent and can merge in either order.