Skip to content

Commit bd58bce

Browse files
committed
package.xml files and travis yml update for Kinetic
1 parent f6c8e58 commit bd58bce

File tree

18 files changed

+117
-201
lines changed

18 files changed

+117
-201
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ nosetests.xml
3535
.mr.developer.cfg
3636
.project
3737
.pydevproject
38+
*.autosave
3839

3940
CATKIN_IGNORE
4041
*.user

.travis.yml

+7-16
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,19 @@
11
sudo: required
2-
dist: trusty
2+
dist: xenial
33
language: generic
44
compiler:
55
- gcc
66
notifications:
77
email:
8-
on_success: always
9-
on_failure: always
10-
# recipients:
11-
# - jane@doe
8+
on_success: never
9+
on_failure: never
1210
env:
13-
matrix:
14-
- USE_DEB=true ROS_DISTRO="indigo" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
15-
- USE_DEB=true ROS_DISTRO="indigo" ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
16-
- USE_DEB=true ROS_DISTRO="jade" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
17-
- USE_DEB=true ROS_DISTRO="jade" ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
11+
global:
1812
- ROS_DISTRO=kinetic
19-
matrix:
20-
allow_failures:
21-
- env: USE_DEB=true ROS_DISTRO="jade" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
22-
- env: USE_DEB=true ROS_DISTRO="jade" ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
23-
- env: ROS_DISTRO=kinetic
13+
matrix:
14+
- ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
15+
- ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
2416
install:
2517
- git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
2618
script:
2719
- source .ci_config/travis.sh
28-
# - source ./travis.sh # Enable this when you have a package-local script

robotiq/package.xml

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
<package>
1+
<?xml version="1.0"?>
2+
<package format="2">
23
<name>robotiq</name>
34
<version>1.0.0</version>
45
<description>ROS drivers for Robotiq Adaptive Grippers and Robotiq Force Torque Sensor</description>
5-
<maintainer email="[email protected]">Shaun Edwards</maintainer>
6+
<maintainer email="[email protected]">Jean-Philippe Roberge</maintainer>
67
<license>BSD</license>
7-
<url type="website">http://ros.org/wiki/motoman</url>
8+
<url type="website">http://ros.org/wiki/robotiq</url>
89

910
<buildtool_depend>catkin</buildtool_depend>
10-
<run_depend>robotiq_s_model_visualization</run_depend>
11-
<run_depend>robotiq_modbus_tcp</run_depend>
12-
<run_depend>robotiq_s_model_control</run_depend>
13-
<run_depend>robotiq_c_model_control</run_depend>
14-
<run_depend>robotiq_force_torque_sensor</run_depend>
11+
<exec_depend>robotiq_s_model_visualization</exec_depend>
12+
<exec_depend>robotiq_modbus_tcp</exec_depend>
13+
<exec_depend>robotiq_s_model_control</exec_depend>
14+
<exec_depend>robotiq_c_model_control</exec_depend>
15+
<exec_depend>robotiq_force_torque_sensor</exec_depend>
1516

1617
<export>
1718
<metapackage/>

robotiq_action_server/package.xml

+8-16
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
2-
<package>
2+
<package format="2">
33
<name>robotiq_action_server</name>
4-
<version>0.1.0</version>
4+
<version>1.0.0</version>
55

66
<description>
77
<p>
@@ -12,23 +12,15 @@
1212
</p>
1313
</description>
1414

15-
<maintainer email="[email protected]">Jonathan Meyer</maintainer>
15+
<maintainer email="[email protected]">Jean-Philippe Roberge</maintainer>
1616
<author>Jonathan Meyer</author>
17-
1817
<license>BSD</license>
1918

20-
2119
<buildtool_depend>catkin</buildtool_depend>
22-
<build_depend>actionlib</build_depend>
23-
<build_depend>actionlib_msgs</build_depend>
24-
<build_depend>control_msgs</build_depend>
25-
<build_depend>robotiq_c_model_control</build_depend>
26-
<build_depend>roscpp</build_depend>
27-
28-
<run_depend>actionlib</run_depend>
29-
<run_depend>actionlib_msgs</run_depend>
30-
<run_depend>control_msgs</run_depend>
31-
<run_depend>robotiq_c_model_control</run_depend>
32-
<run_depend>roscpp</run_depend>
20+
<depend>actionlib</depend>
21+
<depend>actionlib_msgs</depend>
22+
<depend>control_msgs</depend>
23+
<depend>robotiq_c_model_control</depend>
24+
<depend>roscpp</depend>
3325

3426
</package>

robotiq_arg2f_model_visualization/package.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
<license>BSD</license>
77
<url type="website">http://ros.org/wiki/robotiq</url>
88
<author email="[email protected]">Ryan Sinnet</author>
9-
<maintainer email="ryan@rwsinnet.com">Ryan Sinnet</maintainer>
9+
<maintainer email="j-p.roberge@robotiq.com">Jean-Philippe Roberge</maintainer>
1010

1111
<buildtool_depend>catkin</buildtool_depend>
12+
1213
<exec_depend>urdf</exec_depend>
1314

14-
<export/>
1515
</package>
+4-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0"?>
2-
<package>
2+
<package format="2">
33
<name>robotiq_c2_model_visualization</name>
44
<version>1.0.0</version>
55
<description>
@@ -10,14 +10,12 @@
1010
</p>
1111
</description>
1212

13-
<maintainer email="[email protected]">Jonathan Meyer</maintainer>
13+
<maintainer email="[email protected]">Jean-Philippe Roberge</maintainer>
1414
<author>Kel Guerin </author>
15-
16-
<license>BSD</license>
17-
1815
<url type="website">http://ros.org/wiki/robotiq</url>
16+
<license>BSD</license>
1917

2018
<buildtool_depend>catkin</buildtool_depend>
21-
<run_depend>xacro</run_depend>
19+
<exec_depend>xacro</exec_depend>
2220

2321
</package>

robotiq_c_model_control/package.xml

+9-12
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
1-
<package>
1+
<?xml version="1.0"?>
2+
<package format="2">
23
<name>robotiq_c_model_control</name>
34
<version>1.0.0</version>
45
<description>Package to control a C-Model Gripper from Robotiq inc.</description>
5-
<maintainer email="[email protected]">Shaun Edwards</maintainer>
6+
<maintainer email="[email protected]">Jean-Philippe Roberge</maintainer>
67
<license>BSD</license>
78
<url type="website">http://ros.org/wiki/robotiq</url>
89
<author>Nicolas Lauzier (Robotiq inc.)</author>
910

1011
<buildtool_depend>catkin</buildtool_depend>
11-
<build_depend>rospy</build_depend>
12-
<build_depend>roscpp</build_depend>
13-
<build_depend>robotiq_ethercat</build_depend>
14-
<build_depend>message_generation</build_depend>
15-
<run_depend>rospy</run_depend>
16-
<run_depend>message_runtime</run_depend>
17-
<run_depend>roscpp</run_depend>
18-
<run_depend>robotiq_ethercat</run_depend>
1912

13+
<depend>rospy</depend>
14+
<depend>roscpp</depend>
15+
<depend>robotiq_ethercat</depend>
16+
17+
<build_depend>message_generation</build_depend>
2018

19+
<exec_depend>message_runtime</exec_depend>
2120

22-
<export>
23-
</export>
2421
</package>

robotiq_ethercat/package.xml

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
<?xml version="1.0"?>
2-
<package>
2+
<package format="2">
33
<name>robotiq_ethercat</name>
4-
<version>0.1.0</version>
4+
<version>1.0.0</version>
55
<description>
66
<p>
77
ROS-Industrial support stack for facilitating communication with EtherCAT networks.
88
</p>
99
</description>
1010

1111
<author>Jonathan Meyer</author>
12-
<maintainer email="[email protected]">Jonathan Meyer</maintainer>
13-
12+
<maintainer email="[email protected]">Jean-Philippe Roberge</maintainer>
1413
<license>BSD</license>
1514

1615
<buildtool_depend>catkin</buildtool_depend>
17-
<build_depend>soem</build_depend>
18-
<build_depend>roscpp</build_depend>
19-
<run_depend>soem</run_depend>
20-
<run_depend>roscpp</run_depend>
16+
<depend>soem</depend>
17+
<depend>roscpp</depend>
2118

2219
</package>
+7-11
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,21 @@
11
<?xml version="1.0"?>
2-
<package>
2+
<package format="2">
33
<name>robotiq_force_torque_sensor</name>
44
<version>1.0.0</version>
55
<description>Package for reading data from a Robotiq Force Torque Sensor</description>
6-
<maintainer email="nicolas@robotiq.com">Nicolas Lauzier</maintainer>
6+
<maintainer email="j-p.roberge@robotiq.com">Jean-Philippe Roberge</maintainer>
77
<author email="[email protected]">Jonathan Savoie</author>
88
<url type="website">http://ros.org/wiki/robotiq</url>
99

1010
<license>BSD</license>
1111

12-
1312
<buildtool_depend>catkin</buildtool_depend>
14-
<build_depend>roscpp</build_depend>
15-
<build_depend>std_msgs</build_depend>
13+
14+
<depend>roscpp</depend>
15+
<depend>std_msgs</depend>
16+
1617
<build_depend>message_generation</build_depend>
17-
<run_depend>roscpp</run_depend>
18-
<run_depend>std_msgs</run_depend>
19-
<run_depend>message_runtime</run_depend>
20-
2118

22-
<export>
19+
<exec_depend>message_runtime</exec_depend>
2320

24-
</export>
2521
</package>
+9-19
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,22 @@
11
<?xml version="1.0"?>
2-
<package>
2+
<package format="2">
33
<name>robotiq_joint_state_publisher</name>
4-
<version>0.0.0</version>
4+
<version>1.0.0</version>
55
<description>Publishes joint states of Robotiq gripper</description>
6-
<maintainer email="[email protected]">Karl Kruusamäe</maintainer>
6+
<maintainer email="[email protected]">Jean-Philippe Roberge</maintainer>
77
<license>3-clause BSD</license>
88
<author email="[email protected]">Jack Thompson</author>
99

1010
<buildtool_depend>catkin</buildtool_depend>
1111

12-
<build_depend>roscpp</build_depend>
13-
<build_depend>roslib</build_depend>
12+
<depend>roscpp</depend>
13+
<depend>roslib</depend>
14+
<depend>sensor_msgs</depend>
15+
<depend>robotiq_s_model_control</depend>
16+
1417
<build_depend>message_generation</build_depend>
15-
<build_depend>sensor_msgs</build_depend>
16-
<build_depend>robotiq_s_model_control</build_depend>
1718

18-
<run_depend>roscpp</run_depend>
19-
<run_depend>roslib</run_depend>
20-
<run_depend>message_runtime</run_depend>
21-
<run_depend>sensor_msgs</run_depend>
22-
<run_depend>robotiq_s_model_control</run_depend>
23-
24-
<!-- The export tag contains other, unspecified, tags -->
25-
<export>
26-
<!-- You can specify that this package is a metapackage here: -->
27-
<!-- <metapackage/> -->
19+
<exec_depend>message_runtime</exec_depend>
2820

29-
<!-- Other tools can request additional information be placed here -->
3021

31-
</export>
3222
</package>

robotiq_modbus_rtu/package.xml

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
1-
<package>
1+
<?xml version="1.0"?>
2+
<package format="2">
23
<name>robotiq_modbus_rtu</name>
34
<version>1.0.0</version>
45
<description>A stack to communicate with Robotiq grippers using the Modbus RTU protocol</description>
5-
<maintainer email="[email protected]">Shaun Edwards</maintainer>
6-
<maintainer email="[email protected]">Kelsey Hawkins</maintainer>
6+
<maintainer email="[email protected]">Jean-Philippe Roberge</maintainer>
77
<license>BSD</license>
88
<url type="website">http://wiki.ros.org/robotiq</url>
99
<author>Nicolas Lauzier (Robotiq inc.)</author>
1010
<author email="[email protected]">Kelsey Hawkins</author>
1111

1212
<buildtool_depend>catkin</buildtool_depend>
1313

14-
<build_depend>python-pymodbus</build_depend>
15-
<build_depend>rospy</build_depend>
14+
<depend>python-pymodbus</depend>
15+
<depend>rospy</depend>
1616

17-
<run_depend>python-pymodbus</run_depend>
18-
<run_depend>rospy</run_depend>
1917
</package>

robotiq_modbus_tcp/package.xml

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
<package>
1+
<?xml version="1.0"?>
2+
<package format="2">
23
<name>robotiq_modbus_tcp</name>
34
<version>1.0.0</version>
45
<description>A stack to communicate with Robotiq grippers using the Modbus TCP protocol</description>
5-
<maintainer email="[email protected]">Shaun Edwards</maintainer>
6+
<maintainer email="[email protected]">Jean-Philippe Roberge</maintainer>
67
<license>BSD</license>
78
<url type="website">http://wiki.ros.org/robotiq</url>
89
<author>Nicolas Lauzier (Robotiq inc.)</author>
910

1011
<buildtool_depend>catkin</buildtool_depend>
1112

12-
<build_depend>python-pymodbus</build_depend>
13-
<build_depend>rospy</build_depend>
14-
15-
<run_depend>python-pymodbus</run_depend>
16-
<run_depend>rospy</run_depend>
13+
<depend>python-pymodbus</depend>
14+
<depend>rospy</depend>
1715
</package>
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0"?>
2-
<package>
2+
<package format="2">
33
<name>robotiq_s_model_articulated_gazebo</name>
44
<version>1.0.0</version>
55
<description>Launch files for spawning the Robotiq s-model articulated gripper</description>
66

7-
<maintainer email="dash@clearpathrobotics.com">Devon Ash</maintainer>
7+
<maintainer email="j-p.roberge@robotiq.com">Jean-Philippe Roberge</maintainer>
88
<author email="[email protected]">Devon Ash</author>
99

1010
<license>BSD</license>
1111

1212
<buildtool_depend>catkin</buildtool_depend>
1313

14-
<run_depend>gazebo_ros</run_depend>
15-
<run_depend>robotiq_s_model_visualization</run_depend>
14+
<exec_depend>gazebo_ros</exec_depend>
15+
<exec_depend>robotiq_s_model_visualization</exec_depend>
1616

1717
</package>

0 commit comments

Comments
 (0)