Skip to content

Jetty: support package names without version number #17

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.

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

scpeters
Copy link

@scpeters scpeters commented Aug 2, 2025

Per gazebo-tooling/release-tools#1244, version numbers have been removed from package names in Jetty (except for gz-tools2). Support for this change has been prototyped in the draft pull requests listed in gazebosim/gz-jetty#38 and are applied to the template here.

The unversioned {cmake_pkg_name(pkg_name_no_version)}-config.cmake.in and {vendor_name}-extras.cmake.in cmake files are no longer needed since the upstream packages provided unversioned cmake files.

Major version numbers have been removed from all
packages in Gazebo Jetty (except gz-tools2), so
update the template to remove the version number
and the unversioned cmake config template and
the extras cmake template, which are no longer
needed.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters scpeters requested review from azeey and mjcarroll August 2, 2025 03:23
@@ -364,7 +362,7 @@ def main(argv=sys.argv[1:]):
"--overwrite_cmake_configs",
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we may want to rename this argument since it doesn't write cmake configs anymore, though it does control writing of dsv files

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically those are cmake config files (files ending .in which are supposed to be consumed by cmake's configure)

Copy link
Collaborator

@azeey azeey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This script is used when releasing packages in Harmonic and Ionic, so I think we should detect if a package belongs to Jetty and just skip generating the cmake.in files. Alternatively, we could make a branch in gz_vendor that tracks the version of Gazebo the script corresponds to, but that would require changes in our release.py script. I'd vote for the first approach.

@azeey
Copy link
Collaborator

azeey commented Aug 19, 2025

Can you also add support for python bindings by removing

if pkg_has_pybind11(pkg_name_no_version):
params["cmake_args"].append("-DSKIP_PYBIND11:BOOL=ON")

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants