build: post-vcpkg cleanup of dead helper files#7523
Open
tete17 wants to merge 3 commits intoProject-OSRM:masterfrom
Open
build: post-vcpkg cleanup of dead helper files#7523tete17 wants to merge 3 commits intoProject-OSRM:masterfrom
tete17 wants to merge 3 commits intoProject-OSRM:masterfrom
Conversation
The script managed git-subtree updates for vendored dependencies under third_party/. After Project-OSRM#7487 (vcpkg migration), Project-OSRM#7488 (flatbuffers from vcpkg), Project-OSRM#7495 (microtar -> libarchive), and Project-OSRM#7508 (vtzero unvendored via custom vcpkg overlay), third_party/ is empty and every entry the script knew how to update is now provided by vcpkg. Nothing left to manage. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
- cmake/FindTBB.cmake: unused since CMakeLists.txt calls find_package(TBB CONFIG REQUIRED), which uses the TBBConfig.cmake shipped by the vcpkg tbb port and bypasses Find modules entirely. - cmake/FindLua.cmake: an older copy of CMake's upstream FindLua that shadows the built-in via CMAKE_MODULE_PATH. Now unnecessary: the vcpkg lua port ships a vcpkg-cmake-wrapper.cmake that redirects find_package(Lua) to unofficial-lua CONFIG and populates LUA_INCLUDE_DIR / LUA_LIBRARIES. Verified by building osrm_extract (which compiles scripting_environment_lua.cpp) with the file removed. - cmake/FindDebArch.cmake: never include()d; CPackConfig.cmake already inlines the equivalent dpkg --print-architecture logic. - cmake/cmake_options_script.py: a legacy SublimeClang helper for compile_commands.json consumption, superseded by clangd/LSP. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Replace deprecated constructs in the uninstall helper. No behavior change — still reads install_manifest.txt and removes each path. - exec_program -> execute_process (exec_program deprecated since CMake 3.0). - cmake -E remove -> cmake -E rm -f (remove subcommand deprecated since CMake 3.17; project already requires CMake 3.18). - Drop unused OUTPUT_VARIABLE capture. - Fix return-value check to use numeric EQUAL instead of STREQUAL on a stringified int. - Drop the legacy duplicate condition args on else()/endif()/ endforeach() closers. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
e6953d8 to
9a2c84e
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
This PR removes build-system leftovers that became obsolete after the repository’s migration away from vendored/Conan-managed dependencies toward vcpkg, and lightly modernizes the generated uninstall script to match the project’s current CMake baseline.
Changes:
- Deletes dead maintenance/helpers tied to the old vendored dependency flow (
scripts/update_dependencies.sh,cmake/FindTBB.cmake,cmake/FindLua.cmake,cmake/FindDebArch.cmake,cmake/cmake_options_script.py). - Keeps the active build path intact by relying on the current
find_package(... CONFIG ...)/ built-in CMake behavior already present inCMakeLists.txt. - Modernizes
cmake_uninstall.cmake.inby replacing deprecated CMake commands with supported equivalents without changing the uninstall target wiring.
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| scripts/update_dependencies.sh | Removes obsolete vendored-dependency subtree update script. |
| cmake/FindTBB.cmake | Deletes unused custom TBB find module; project now uses find_package(TBB CONFIG REQUIRED). |
| cmake/FindLua.cmake | Deletes shadowing custom Lua find module; project continues through built-in/vcpkg package resolution. |
| cmake/FindDebArch.cmake | Removes unreferenced Debian architecture helper superseded by cmake/CPackConfig.cmake. |
| cmake/cmake_uninstall.cmake.in | Updates uninstall script to modern CMake commands and simplified control-flow syntax. |
| cmake/cmake_options_script.py | Removes legacy editor helper with no remaining in-repo references. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
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.
Summary
Follow-up cleanup to the vcpkg migration. Three small, independent build-system commits that remove dead weight left behind once Conan + the
third_party/vendored deps were retired.scripts/update_dependencies.sh— the script managed git-subtree updates for vendored deps underthird_party/. After build: migrate from Conan + vendored deps to vcpkg manifest mode #7487 (vcpkg migration), build: generate flatbuffers headers at build time #7488 (flatbuffers from vcpkg), build: replace vendored microtar with libarchive from vcpkg #7495 (microtar → libarchive), and build: unvendor vtzero, provide custom vcpkg overlay #7508 (vtzero unvendored via custom vcpkg overlay),third_party/is empty and every entry the script knew how to update is now provided by vcpkg. Nothing left to manage — delete the file.cmake/FindTBB.cmake— unused sincefind_package(TBB CONFIG REQUIRED)resolves via the vcpkgtbbport'sTBBConfig.cmakeand bypasses Find modules entirely.cmake/FindLua.cmake— an older copy of CMake's upstream module that shadowed the built-in viaCMAKE_MODULE_PATH. The vcpkgluaport ships avcpkg-cmake-wrapper.cmakethat redirectsfind_package(Lua)tounofficial-luaCONFIG and populatesLUA_INCLUDE_DIR/LUA_LIBRARIES. Verified by rebuildingosrm_extract(which compilesscripting_environment_lua.cpp) with the file removed.cmake/FindDebArch.cmake— neverinclude()d;CPackConfig.cmakealready inlines the equivalentdpkg --print-architecturelogic.cmake/cmake_options_script.py— a legacy SublimeClang helper forcompile_commands.jsonconsumption, superseded by clangd/LSP.cmake_uninstall.cmake.in— replace constructs deprecated since CMake 3.0 / 3.17 (project already requires 3.18):exec_program→execute_process,cmake -E remove→cmake -E rm -f. Also fix a stringly-typed return-value check (STREQUALon a stringified int → numericEQUAL), drop an unusedOUTPUT_VARIABLE, and remove the legacy duplicate-condition args onelse()/endif()/endforeach()closers. No behaviour change.Net diff: +10 / -811 across 6 files.
Test plan
cmake --build && cmake --installstill produces the expected artefactsmake uninstallon an installed tree still removes everything ininstall_manifest.txt