Skip to content
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

Expose C code generation via rosidl generate CLI #569

Merged
merged 2 commits into from
Mar 10, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
4 changes: 1 addition & 3 deletions rosidl_generator_c/bin/rosidl_generator_c
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ def main(argv=sys.argv[1:]):
help='The location of the file containing the generator arguments')
args = parser.parse_args(argv)

return generate_c(
args.generator_arguments_file,
)
generate_c(args.generator_arguments_file)


if __name__ == '__main__':
Expand Down
1 change: 1 addition & 0 deletions rosidl_generator_c/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

<build_export_depend>rosidl_typesupport_interface</build_export_depend>

<exec_depend>rosidl_cli</exec_depend>
<exec_depend>rosidl_parser</exec_depend>

<test_depend>ament_cmake_gtest</test_depend>
Expand Down
2 changes: 1 addition & 1 deletion rosidl_generator_c/rosidl_generator_c/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def generate_c(generator_arguments_file):
'idl__struct.h.em': 'detail/%s__struct.h',
'idl__type_support.h.em': 'detail/%s__type_support.h',
}
generate_files(
return generate_files(
generator_arguments_file, mapping,
post_process_callback=prefix_with_bom_if_necessary)

Expand Down
81 changes: 81 additions & 0 deletions rosidl_generator_c/rosidl_generator_c/cli.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
# Copyright 2021 Open Source Robotics Foundation, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import pathlib

from ament_index_python import get_package_share_directory
from rosidl_cli.command.generate.extensions import GenerateCommandExtension
from rosidl_cli.command.helpers import generate_visibility_control_file
from rosidl_cli.command.helpers import legacy_generator_arguments_file
from rosidl_cli.command.translate.api import translate

from rosidl_generator_c import generate_c


class GenerateC(GenerateCommandExtension):

def generate(
self,
package_name,
interface_files,
include_paths,
output_path
):
generated_files = []

package_share_path = \
pathlib.Path(get_package_share_directory('rosidl_generator_c'))
templates_path = package_share_path / 'resource'

# Normalize interface definition format to .idl
idl_interface_files = []
non_idl_interface_files = []
for path in interface_files:
if not path.endswith('.idl'):
non_idl_interface_files.append(path)
else:
idl_interface_files.append(path)
if non_idl_interface_files:
idl_interface_files.extend(translate(
package_name=package_name,
interface_files=non_idl_interface_files,
include_paths=include_paths,
output_format='idl',
output_path=output_path / 'tmp',
))

# Generate visibility control file
visibility_control_file_template_path = \
templates_path / 'rosidl_generator_c__visibility_control.h.in'
visibility_control_file_path = \
output_path / 'msg' / 'rosidl_generator_c__visibility_control.h'

generate_visibility_control_file(
package_name=package_name,
template_path=visibility_control_file_template_path,
output_path=visibility_control_file_path
)
generated_files.append(visibility_control_file_path)

# Generate code
with legacy_generator_arguments_file(
package_name=package_name,
interface_files=idl_interface_files,
include_paths=include_paths,
templates_path=templates_path,
output_path=output_path
) as path_to_arguments_file:
generated_files.extend(generate_c(path_to_arguments_file))

return generated_files
3 changes: 3 additions & 0 deletions rosidl_generator_c/setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[options.entry_points]
rosidl_cli.command.generate.type_extensions =
c = rosidl_generator_c.cli:GenerateC