Fix genapkbuild.py to set build_type to cmake for ROS1 packages whose buildtool_depend is not catkin #168
Conversation
This file contains 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
… buildtool_depend is not catkin
at-wat
reviewed
May 29, 2024
| @@ -266,6 +266,8 @@ def package_to_apkbuild(ros_distro, package_name, | |||
| ament_python = False | |||
|
|
|||
| build_type = pkg.get_build_type() | |||
| if not is_ros2 and not pkg.has_buildtool_depend_on_catkin(): | |||
| build_type = 'cmake' | |||
| if build_type == 'catkin': | |||
| catkin = True | |||
| elif build_type == 'cmake': | |||
There was a problem hiding this comment.
Do we still need this condition?
There was a problem hiding this comment.
It's not that necessary but if there will be automatic updates for ROS 1 packages registered in aports-ros-experimental, this change might be useful as we don't need to fix them by hand.
There was a problem hiding this comment.
I thought L271 is elif.
Maybe better to add a newline after L270.
If ROS2 package may specify <build_type>cmake</build_type>, this should be required for ROS2 package with build_type=cmake.
There was a problem hiding this comment.
I understand what you mean now. I agree to change L271 to elif. Done in fa0f9b9.
at-wat
reviewed
May 29, 2024
Co-authored-by: Atsushi Watanabe <[email protected]>
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.
build_typeis not specified inpackage.xmlofcatkinpackage. In this case,get_build_type()returns "catkin". This has changedAPKBUILDofcatkinpackage to build it bycatkin.By this PR,
build_typeis overwritten if the package is not ROS 2 and not buildtool_depend==catkin.(originally reported by @at-wat)