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

Support service generation on action folders #44

Merged
merged 3 commits into from
Oct 30, 2018

Conversation

hidmic
Copy link
Contributor

@hidmic hidmic commented Oct 23, 2018

Connected to ros2/rosidl#301. This pull request is part of a series of pull requests that make the necessary changes to allow us to build .srv files outside an srv folder.

connects to ros2/rosidl#301

@tfoote tfoote added the in progress Actively being worked on (Kanban column) label Oct 23, 2018
@@ -54,6 +55,8 @@ macro(rosidl_generate_dds_interfaces target)
list(APPEND _generated_msg_files "${_output_path}/${_name}_.idl")
elseif(_parent_folder STREQUAL "srv")
list(APPEND _generated_srv_files "${_output_path}/${_name}_.idl")
elseif(_parent_folder STREQUAL "action")
Copy link
Member

@jacobperron jacobperron Oct 24, 2018

Choose a reason for hiding this comment

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

Do we also want another elseif block in the parent scope for the file extension? And maybe more importantly if a .srv file appears inside an action folder? E.g.

elseif(_extension STREQUAL ".srv")
  if(_parent_folder STREQUAL "srv")
    list(APPEND _generated_srv_files "${_output_path}/Sample_${_name}_Request_.idl")
    list(APPEND _generated_srv_files "${_output_path}/Sample_${_name}_Response_.idl")
  elseif(_parent_folder STREQUAL "action")
    list(APPEND _generated_action_files "${_output_path}/Sample_${_name}_Request_.idl")
    list(APPEND _generated_action_files "${_output_path}/Sample_${_name}_Response_.idl")
  else()
    ...
  endif()
elseif(_extension STREQUAL ".action")
  # Do something here?
else()
  ...
endif()

@jacobperron
Copy link
Member

LGTM

Copy link
Member

@jacobperron jacobperron left a comment

Choose a reason for hiding this comment

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

Pending CI

@apojomovsky
Copy link
Contributor

Ok, given that we have green light I'm proceeding to merge this and its related PRs

@apojomovsky apojomovsky merged commit e4bd7eb into master Oct 30, 2018
@tfoote tfoote removed the in progress Actively being worked on (Kanban column) label Oct 30, 2018
@apojomovsky apojomovsky deleted the hidmic/prepare_for_action_generation branch November 1, 2018 19:04
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.

None yet

5 participants