Skip to content

Install clang-tools by default #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tobias-Fischer merged 4 commits into from
Aug 13, 2026
Merged

Install clang-tools by default #133

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
88ca308
Add macOS clang-scan-deps support
mini-1235 Aug 8, 2026
37f7091
Explain macOS clang scanner lookup
mini-1235 Aug 8, 2026
aae9654
Revert *.sh.in changes
mini-1235 Aug 11, 2026
f02c9a8
Restore shell template final newlines
mini-1235 Aug 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 30 additions & 5 deletions vinca/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,27 +424,41 @@ def generate_output(pkg_shortname, vinca_conf, distro, version, all_pkgs=None):
output["requirements"]["run"].extend(resolved_python)
output["requirements"]["host"].extend(resolved_python)

if is_dummy_metapackage(pkg_shortname, vinca_conf):
is_dummy_package = is_dummy_metapackage(pkg_shortname, vinca_conf)
build_type = pkg.get_build_type()

if is_dummy_package:
# Dummy recipes do not actually build anything, so we set the script to empty
output["build"]["script"] = ""
elif pkg.get_build_type() in ["cmake", "catkin"]:
elif build_type in ["cmake", "catkin"]:
output["build"]["script"] = (
"${{ '$RECIPE_DIR/build_catkin.sh' if unix or wasm32 else '%RECIPE_DIR%\\\\bld_catkin.bat' }}"
)
elif pkg.get_build_type() in ["ament_cmake"]:
elif build_type in ["ament_cmake"]:
output["build"]["script"] = (
"${{ '$RECIPE_DIR/build_ament_cmake.sh' if unix or wasm32 else '%RECIPE_DIR%\\\\bld_ament_cmake.bat' }}"
)
elif pkg.get_build_type() in ["ament_python"]:
elif build_type in ["ament_python"]:
output["build"]["script"] = (
"${{ '$RECIPE_DIR/build_ament_python.sh' if unix or wasm32 else '%RECIPE_DIR%\\\\bld_ament_python.bat' }}"
)
resolved_setuptools = resolve_pkgname("python-setuptools", vinca_conf, distro)
output["requirements"]["host"].extend(resolved_setuptools)
else:
print(f"Unknown build type for {pkg_shortname}: {pkg.get_build_type()}")
print(f"Unknown build type for {pkg_shortname}: {build_type}")
return None

if not is_dummy_package and build_type in ["cmake", "catkin", "ament_cmake"]:
output["requirements"]["build"].append(
{
"if": "osx",
"then": [
"clang-tools ${{ (cxx_compiler_version ~ '.*') if "
"cxx_compiler_version is defined else '*' }}"
],
}
)

if vinca_conf.get("mutex_package"):
mutex_dep = get_mutex_package_dependency(vinca_conf, distro)
if mutex_dep:
Expand Down Expand Up @@ -1152,6 +1166,17 @@ def parse_package(pkg, distro, vinca_conf, path):
"${{ '$RECIPE_DIR/build_catkin.sh' if unix or wasm32 else '%RECIPE_DIR%\\\\bld_catkin.bat' }}"
)

if pkg.get_build_type() in ["cmake", "catkin", "ament_cmake"]:
recipe["requirements"]["build"].append(
{
"if": "osx",
"then": [
"clang-tools ${{ (cxx_compiler_version ~ '.*') if "
"cxx_compiler_version is defined else '*' }}"
],
}
)

return recipe


Expand Down