Skip to content

Commit 1abc390

Browse files
authored
feat: obtain interface version from cmake variable (#191)
* feat: obtain interface version from cmake variable Signed-off-by: Daisuke Nishimatsu <[email protected]> * refactor: append package version into generator arguments file Signed-off-by: Daisuke Nishimatsu <[email protected]>
1 parent 8b0f891 commit 1abc390

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

rosidl_generator_rs/bin/rosidl_generator_rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ def main(argv=sys.argv[1:]):
3333
help='All the available typesupport implementations')
3434
args = parser.parse_args(argv)
3535

36-
return generate_rs(args.generator_arguments_file, args.typesupport_impls)
36+
return generate_rs(
37+
args.generator_arguments_file,
38+
args.typesupport_impls,
39+
)
3740

3841

3942
if __name__ == '__main__':

rosidl_generator_rs/cmake/rosidl_generator_rs_generate_interfaces.cmake

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,11 @@ rosidl_write_generator_arguments(
130130
TARGET_DEPENDENCIES ${target_dependencies}
131131
)
132132

133+
file(READ ${generator_arguments_file} contents)
134+
string(REPLACE "\n}"
135+
",\n \"package_version\": \"${${PROJECT_NAME}_VERSION}\"\n}" contents ${contents})
136+
file(WRITE ${generator_arguments_file} ${contents})
137+
133138
file(MAKE_DIRECTORY "${_output_path}")
134139

135140
set(_target_suffix "__rs")

rosidl_generator_rs/resource/Cargo.toml.em

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
[package]
22
name = "@(package_name)"
3-
@# The version should ideally be taken from package.xml, see
4-
@# https://github.com/ros2-rust/ros2_rust/issues/116
5-
version = "0.2.0"
3+
version = "@(package_version)"
64
edition = "2021"
75

86
[dependencies]

rosidl_generator_rs/rosidl_generator_rs/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ def generate_rs(generator_arguments_file, typesupport_impls):
157157
cargo_toml_data = {
158158
'dependency_packages': dependency_packages,
159159
'package_name': args['package_name'],
160+
'package_version': args['package_version'],
160161
}
161162
expand_template(
162163
os.path.join(template_dir, 'Cargo.toml.em'),

0 commit comments

Comments
 (0)