Replace rosidl_cmake imports with rosidl_pycommon (#126)

Signed-off-by: Jacob Perron <jacob@openrobotics.org>
ros2 · Aug 10, 2022 · 8b093ed · 8b093ed
1 parent c35869b
commit 8b093ed
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 8 deletions.
diff --git a/rosidl_typesupport_c/package.xml b/rosidl_typesupport_c/package.xml
@@ -29,6 +29,7 @@
 
   <exec_depend>ament_index_python</exec_depend>
   <exec_depend>rosidl_cli</exec_depend>
+  <exec_depend>rosidl_pycommon</exec_depend>
   <exec_depend>rosidl_typesupport_interface</exec_depend>
 
   <test_depend>ament_lint_auto</test_depend>

diff --git a/rosidl_typesupport_c/resource/action__type_support.c.em b/rosidl_typesupport_c/resource/action__type_support.c.em
@@ -1,9 +1,10 @@
 @# Included from rosidl_typesupport_c/resource/idl__type_support.c.em
 @{
-from rosidl_cmake import convert_camel_case_to_lower_case_underscore
 from rosidl_parser.definition import ACTION_FEEDBACK_MESSAGE_SUFFIX
 from rosidl_parser.definition import ACTION_GOAL_SERVICE_SUFFIX
 from rosidl_parser.definition import ACTION_RESULT_SERVICE_SUFFIX
+from rosidl_pycommon import convert_camel_case_to_lower_case_underscore
+
 include_parts = [package_name] + list(interface_path.parents[0].parts) + \
     [convert_camel_case_to_lower_case_underscore(interface_path.stem)]
 include_base = '/'.join(include_parts)

diff --git a/rosidl_typesupport_c/resource/msg__type_support.cpp.em b/rosidl_typesupport_c/resource/msg__type_support.cpp.em
@@ -1,6 +1,6 @@
 @# Included from rosidl_typesupport_c/resource/idl__type_support.c.em
 @{
-from rosidl_cmake import convert_camel_case_to_lower_case_underscore
+from rosidl_pycommon import convert_camel_case_to_lower_case_underscore
 include_parts = [package_name] + list(interface_path.parents[0].parts) + [
     'detail', convert_camel_case_to_lower_case_underscore(interface_path.stem)]
 include_base = '/'.join(include_parts)

diff --git a/rosidl_typesupport_c/resource/srv__type_support.cpp.em b/rosidl_typesupport_c/resource/srv__type_support.cpp.em
@@ -16,7 +16,7 @@ TEMPLATE(
 }@
 
 @{
-from rosidl_cmake import convert_camel_case_to_lower_case_underscore
+from rosidl_pycommon import convert_camel_case_to_lower_case_underscore
 include_parts = [package_name] + list(interface_path.parents[0].parts) + [
     'detail', convert_camel_case_to_lower_case_underscore(interface_path.stem)]
 include_base = '/'.join(include_parts)

diff --git a/rosidl_typesupport_c/rosidl_typesupport_c/__init__.py b/rosidl_typesupport_c/rosidl_typesupport_c/__init__.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from rosidl_cmake import generate_files
+from rosidl_pycommon import generate_files
 
 
 def generate_c(generator_arguments_file, type_supports):

diff --git a/rosidl_typesupport_cpp/package.xml b/rosidl_typesupport_cpp/package.xml
@@ -31,6 +31,7 @@
 
   <exec_depend>ament_index_python</exec_depend>
   <exec_depend>rosidl_cli</exec_depend>
+  <exec_depend>rosidl_pycommon</exec_depend>
   <exec_depend>rosidl_typesupport_interface</exec_depend>
 
   <test_depend>ament_lint_auto</test_depend>

diff --git a/rosidl_typesupport_cpp/resource/action__type_support.cpp.em b/rosidl_typesupport_cpp/resource/action__type_support.cpp.em
@@ -1,6 +1,6 @@
 @# Included from rosidl_typesupport_cpp/resource/idl__type_support.cpp.em
 @{
-from rosidl_cmake import convert_camel_case_to_lower_case_underscore
+from rosidl_pycommon import convert_camel_case_to_lower_case_underscore
 include_parts = [package_name] + list(interface_path.parents[0].parts) + [
     'detail', convert_camel_case_to_lower_case_underscore(interface_path.stem)]
 include_base = '/'.join(include_parts)

diff --git a/rosidl_typesupport_cpp/resource/msg__type_support.cpp.em b/rosidl_typesupport_cpp/resource/msg__type_support.cpp.em
@@ -1,6 +1,6 @@
 @# Included from rosidl_typesupport_cpp/resource/idl__type_support.cpp.em
 @{
-from rosidl_cmake import convert_camel_case_to_lower_case_underscore
+from rosidl_pycommon import convert_camel_case_to_lower_case_underscore
 include_parts = [package_name] + list(interface_path.parents[0].parts) + [
     'detail', convert_camel_case_to_lower_case_underscore(interface_path.stem)]
 include_base = '/'.join(include_parts)

diff --git a/rosidl_typesupport_cpp/resource/srv__type_support.cpp.em b/rosidl_typesupport_cpp/resource/srv__type_support.cpp.em
@@ -16,7 +16,7 @@ TEMPLATE(
 }@
 
 @{
-from rosidl_cmake import convert_camel_case_to_lower_case_underscore
+from rosidl_pycommon import convert_camel_case_to_lower_case_underscore
 include_parts = [package_name] + list(interface_path.parents[0].parts) + [
     'detail', convert_camel_case_to_lower_case_underscore(interface_path.stem)]
 include_base = '/'.join(include_parts)

diff --git a/rosidl_typesupport_cpp/rosidl_typesupport_cpp/__init__.py b/rosidl_typesupport_cpp/rosidl_typesupport_cpp/__init__.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from rosidl_cmake import generate_files
+from rosidl_pycommon import generate_files
 
 
 def generate_cpp(generator_arguments_file, type_supports):