remove dependency on ament_python and perform customizations in setup…

….py and setup.cfg
ros2 · Aug 11, 2017 · b46010b · b46010b
1 parent f1b02f9
commit b46010b
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 28 deletions.
diff --git a/rclpy/services/minimal_client/package.xml b/rclpy/services/minimal_client/package.xml
@@ -8,8 +8,6 @@
   <maintainer email="mikael@osrfoundation.org">Mikael Arguedas</maintainer>
   <license>Apache License 2.0</license>
 
-  <build_depend>ament_python</build_depend>
-
   <exec_depend>example_interfaces</exec_depend>
   <exec_depend>rclpy</exec_depend>
   <exec_depend>std_msgs</exec_depend>

diff --git a/rclpy/services/minimal_client/setup.cfg b/rclpy/services/minimal_client/setup.cfg
@@ -0,0 +1,2 @@
+[install]
+install-scripts=$base/lib/examples_rclpy_minimal_client
diff --git a/rclpy/services/minimal_client/setup.py b/rclpy/services/minimal_client/setup.py
@@ -1,10 +1,6 @@
-from ament_python.data_files import get_data_files
-from ament_python.script_dir import install_scripts_to_libexec
 from setuptools import setup
 
 package_name = 'examples_rclpy_minimal_client'
-data_files = get_data_files(package_name)
-install_scripts_to_libexec(package_name)
 
 setup(
     name=package_name,
@@ -14,7 +10,11 @@
         'client',
         'client_async',
         'client_async_member_function'],
-    data_files=data_files,
+    data_files=[
+        ('share/ament_index/resource_index/packages',
+            ['resource/' + package_name]),
+        ('share/' + package_name, ['package.xml']),
+    ],
     install_requires=['setuptools'],
     author='Mikael Arguedas',
     author_email='Mikael@osrfoundation.org',

diff --git a/rclpy/services/minimal_service/package.xml b/rclpy/services/minimal_service/package.xml
@@ -8,8 +8,6 @@
   <maintainer email="mikael@osrfoundation.org">Mikael Arguedas</maintainer>
   <license>Apache License 2.0</license>
 
-  <build_depend>ament_python</build_depend>
-
   <exec_depend>example_interfaces</exec_depend>
   <exec_depend>rclpy</exec_depend>
   <exec_depend>std_msgs</exec_depend>

diff --git a/rclpy/services/minimal_service/setup.cfg b/rclpy/services/minimal_service/setup.cfg
@@ -0,0 +1,2 @@
+[install]
+install-scripts=$base/lib/examples_rclpy_minimal_service
diff --git a/rclpy/services/minimal_service/setup.py b/rclpy/services/minimal_service/setup.py
@@ -1,10 +1,6 @@
-from ament_python.data_files import get_data_files
-from ament_python.script_dir import install_scripts_to_libexec
 from setuptools import setup
 
 package_name = 'examples_rclpy_minimal_service'
-data_files = get_data_files(package_name)
-install_scripts_to_libexec(package_name)
 
 setup(
     name=package_name,
@@ -13,7 +9,11 @@
     py_modules=[
         'service',
         'service_member_function'],
-    data_files=data_files,
+    data_files=[
+        ('share/ament_index/resource_index/packages',
+            ['resource/' + package_name]),
+        ('share/' + package_name, ['package.xml']),
+    ],
     install_requires=['setuptools'],
     author='Mikael Arguedas',
     author_email='Mikael@osrfoundation.org',

diff --git a/rclpy/topics/minimal_publisher/package.xml b/rclpy/topics/minimal_publisher/package.xml
@@ -8,8 +8,6 @@
   <maintainer email="mikael@osrfoundation.org">Mikael Arguedas</maintainer>
   <license>Apache License 2.0</license>
 
-  <build_depend>ament_python</build_depend>
-
   <exec_depend>rclpy</exec_depend>
   <exec_depend>std_msgs</exec_depend>
 

diff --git a/rclpy/topics/minimal_publisher/setup.cfg b/rclpy/topics/minimal_publisher/setup.cfg
@@ -0,0 +1,2 @@
+[install]
+install-scripts=$base/lib/examples_rclpy_minimal_publisher
diff --git a/rclpy/topics/minimal_publisher/setup.py b/rclpy/topics/minimal_publisher/setup.py
@@ -1,10 +1,6 @@
-from ament_python.data_files import get_data_files
-from ament_python.script_dir import install_scripts_to_libexec
 from setuptools import setup
 
 package_name = 'examples_rclpy_minimal_publisher'
-data_files = get_data_files(package_name)
-install_scripts_to_libexec(package_name)
 
 setup(
     name=package_name,
@@ -14,7 +10,11 @@
         'publisher_old_school',
         'publisher_local_function',
         'publisher_member_function'],
-    data_files=data_files,
+    data_files=[
+        ('share/ament_index/resource_index/packages',
+            ['resource/' + package_name]),
+        ('share/' + package_name, ['package.xml']),
+    ],
     install_requires=['setuptools'],
     author='Mikael Arguedas',
     author_email='Mikael@osrfoundation.org',

diff --git a/rclpy/topics/minimal_subscriber/package.xml b/rclpy/topics/minimal_subscriber/package.xml
@@ -7,8 +7,6 @@
   <maintainer email="mikael@osrfoundation.org">Mikael Arguedas</maintainer>
   <license>Apache License 2.0</license>
 
-  <build_depend>ament_python</build_depend>
-
   <exec_depend>rclpy</exec_depend>
   <exec_depend>std_msgs</exec_depend>
 

diff --git a/rclpy/topics/minimal_subscriber/setup.cfg b/rclpy/topics/minimal_subscriber/setup.cfg
@@ -0,0 +1,2 @@
+[install]
+install-scripts=$base/lib/examples_rclpy_minimal_subscriber
diff --git a/rclpy/topics/minimal_subscriber/setup.py b/rclpy/topics/minimal_subscriber/setup.py
@@ -1,10 +1,6 @@
-from ament_python.data_files import get_data_files
-from ament_python.script_dir import install_scripts_to_libexec
 from setuptools import setup
 
 package_name = 'examples_rclpy_minimal_subscriber'
-data_files = get_data_files(package_name)
-install_scripts_to_libexec(package_name)
 
 setup(
     name=package_name,
@@ -14,7 +10,11 @@
         'subscriber_old_school',
         'subscriber_lambda',
         'subscriber_member_function'],
-    data_files=data_files,
+    data_files=[
+        ('share/ament_index/resource_index/packages',
+            ['resource/' + package_name]),
+        ('share/' + package_name, ['package.xml']),
+    ],
     install_requires=['setuptools'],
     author='Mikael Arguedas',
     author_email='Mikael@osrfoundation.org',