Skip to content

Commit ccbbdbc

Browse files
committed
fix: populate_ament_cargo maintainer information
- fix incorrect parsing for maintainer name and email - remove parameter for node name for ament_cargo and only pass library name Signed-off-by: Parth Patel <[email protected]>
1 parent 37998b6 commit ccbbdbc

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

ros2pkg/ros2pkg/api/create.py

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -317,26 +317,24 @@ def populate_cpp_library(package, source_directory, include_directory, cpp_libra
317317
'visibility_control.h',
318318
visibility_config)
319319

320-
def populate_ament_cargo(package, package_directory, cargo_node_name, cargo_library_name):
321-
print("Cargo Package Make Pending")
322-
exit(1)
323-
cmakelists_config = {
320+
def populate_ament_cargo(package, package_directory, cargo_library_name):
321+
cargo_toml_config = {
324322
'project_name': package.name,
325323
'dependencies': [str(dep) for dep in package.build_depends],
326-
'cargo_node_name': cargo_node_name,
327324
'cargo_library_name': cargo_library_name,
325+
'maintainer_email': package.maintainers[0].email,
326+
'maintainer_name': package.maintainers[0].name,
328327
}
329328
_create_template_file(
330-
'ament_cmake',
331-
'CMakeLists.txt.em',
329+
'ament_cargo',
330+
'Cargo.toml.em',
332331
package_directory,
333-
'CMakeLists.txt',
334-
cmakelists_config)
332+
'Cargo.toml',
333+
cargo_toml_config)
335334

336335

337336
def populate_rust_node(package, source_directory, cargo_node_name):
338337
print("Cargo Node Make Pending")
339-
exit(1)
340338
cargo_node_config = {
341339
'package_name': package.name,
342340
}

ros2pkg/ros2pkg/verb/create.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ def get_git_config(key: str) -> Optional[str]:
202202
populate_ament_cmake(package, package_directory, node_name, library_name)
203203

204204
if args.build_type == 'ament_cargo':
205-
populate_ament_cargo(package, package_directory, node_name, library_name)
205+
populate_ament_cargo(package, package_directory, library_name)
206206

207207
if args.build_type == 'ament_python':
208208
if not source_directory:

0 commit comments

Comments
 (0)