Skip to content

Commit f6d7f4c

Browse files
committed
refactor package xml to 2.0
1 parent 5d34c1b commit f6d7f4c

File tree

12 files changed

+51
-76
lines changed

12 files changed

+51
-76
lines changed

image_recognition/package.xml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,26 @@
11
<?xml version="1.0"?>
2-
<package>
2+
<package format="2">
33
<name>image_recognition</name>
44
<version>0.0.4</version>
55
<description>The image_recognition package</description>
66

77
<maintainer email="[email protected]">Rein Appeldoorn</maintainer>
88

9-
<license>TODO</license>
9+
<license>MIT</license>
1010
<buildtool_depend>catkin</buildtool_depend>
1111

12-
<run_depend>image_recognition_msgs</run_depend>
13-
14-
<run_depend>image_recognition_tensorflow</run_depend>
12+
<run_depend>image_recognition_analysis</run_depend>
1513
<run_depend>image_recognition_keras</run_depend>
14+
<run_depend>image_recognition_msgs</run_depend>
1615
<run_depend>image_recognition_openface</run_depend>
17-
<run_depend>image_recognition_skybiometry</run_depend>
1816
<run_depend>image_recognition_openpose</run_depend>
19-
<run_depend>image_recognition_util</run_depend>
20-
<run_depend>image_recognition_analysis</run_depend>
21-
2217
<run_depend>image_recognition_rqt</run_depend>
18+
<run_depend>image_recognition_skybiometry</run_depend>
19+
<run_depend>image_recognition_tensorflow</run_depend>
2320
<run_depend>image_recognition_tensorflow_rqt</run_depend>
21+
<run_depend>image_recognition_util</run_depend>
2422

2523
<export>
26-
<metapackage/>
24+
<metapackage/>
2725
</export>
2826
</package>

image_recognition_analysis/package.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<maintainer email="[email protected]">Loy van Beek</maintainer>
88

9-
<license>TODO</license>
9+
<license>MIT</license>
1010

1111
<url type="website">https://github.com/tue-robotics/image_recognition/tree/master/image_recognition_analysis</url>
1212

@@ -17,5 +17,4 @@
1717
<exec_depend>python-numpy</exec_depend>
1818
<exec_depend>python-scipy</exec_depend>
1919
<exec_depend>python-sklearn</exec_depend>
20-
2120
</package>

image_recognition_jetson/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ add_compile_options(-std=c++11)
1010
find_package(catkin REQUIRED COMPONENTS
1111
cv_bridge
1212
image_recognition_msgs
13+
image_recognition_util
1314
image_transport
1415
roscpp
1516
sensor_msgs

image_recognition_keras/package.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66

77
<maintainer email="[email protected]">Rein Appeldoorn</maintainer>
88

9-
<license>TODO</license>
9+
<license>MIT</license>
1010

1111
<buildtool_depend>catkin</buildtool_depend>
1212

1313
<exec_depend>diagnostic_updater</exec_depend>
14-
<exec_depend>rospy</exec_depend>
1514
<exec_depend>image_recognition_msgs</exec_depend>
1615
<exec_depend>image_recognition_util</exec_depend>
1716
<exec_depend>python-keras-pip</exec_depend>
1817
<exec_depend>python-numpy</exec_depend>
1918
<exec_depend>python-opencv</exec_depend>
2019
<exec_depend>python-tensorflow-pip</exec_depend>
20+
<exec_depend>rospy</exec_depend>
2121
</package>

image_recognition_msgs/package.xml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
<?xml version="1.0"?>
2-
<package>
2+
<package format="2">
33
<name>image_recognition_msgs</name>
44
<version>0.0.4</version>
55
<description>The image_recognition_msgs package</description>
66

77
<maintainer email="[email protected]">Rein Appeldoorn</maintainer>
88

9-
<license>TODO</license>
9+
<license>MIT</license>
1010

1111
<buildtool_depend>catkin</buildtool_depend>
1212

1313
<build_depend>message_generation</build_depend>
14-
<build_depend>sensor_msgs</build_depend>
15-
16-
<run_depend>sensor_msgs</run_depend>
17-
<run_depend>message_generation</run_depend>
18-
14+
<depend>sensor_msgs</depend>
15+
<exec_depend>message_runtime</exec_depend>
1916
</package>
Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,19 @@
11
<?xml version="1.0"?>
2-
<package>
2+
<package format="2">
33
<name>image_recognition_openface</name>
44
<version>0.0.4</version>
55
<description>The image_recognition_openface package</description>
66

77
<maintainer email="[email protected]">Rein Appeldoorn</maintainer>
88

9-
<license>TODO</license>
9+
<license>MIT</license>
1010

1111
<buildtool_depend>catkin</buildtool_depend>
12-
<build_depend>cv_bridge</build_depend>
13-
<build_depend>image_recognition_msgs</build_depend>
14-
<build_depend>image_recognition_util</build_depend>
15-
<build_depend>rospy</build_depend>
16-
17-
<run_depend>cv_bridge</run_depend>
18-
<run_depend>image_recognition_msgs</run_depend>
19-
<run_depend>image_recognition_util</run_depend>
20-
<run_depend>rospy</run_depend>
21-
<run_depend>python-numpy</run_depend>
22-
<run_depend>diagnostic_updater</run_depend>
2312

13+
<exec_depend>cv_bridge</exec_depend>
14+
<exec_depend>image_recognition_msgs</exec_depend>
15+
<exec_depend>image_recognition_util</exec_depend>
16+
<exec_depend>rospy</exec_depend>
17+
<exec_depend>python-numpy</exec_depend>
18+
<exec_depend>diagnostic_updater</exec_depend>
2419
</package>

image_recognition_openpose/package.xml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,13 @@
66

77
<maintainer email="[email protected]">Rein Appeldoorn</maintainer>
88

9-
<license>TODO</license>
9+
<license>MIT</license>
1010

1111
<buildtool_depend>catkin</buildtool_depend>
1212

13-
<depend>roscpp</depend>
1413
<depend>cv_bridge</depend>
14+
<depend>diagnostic_updater</depend>
1515
<depend>image_recognition_msgs</depend>
16-
1716
<depend>libopencv-dev</depend>
18-
<depend>diagnostic_updater</depend>
19-
17+
<depend>roscpp</depend>
2018
</package>

image_recognition_rqt/package.xml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,20 @@
11
<?xml version="1.0"?>
2-
<package>
2+
<package format="2">
33
<name>image_recognition_rqt</name>
44
<version>0.0.4</version>
55
<description>The image_recognition_rqt package</description>
66

77
<maintainer email="[email protected]">Rein Appeldoorn</maintainer>
88

9-
<license>TODO</license>
9+
<license>MIT</license>
1010

1111
<buildtool_depend>catkin</buildtool_depend>
1212

13-
<build_depend>rospy</build_depend>
14-
<build_depend>rqt_gui</build_depend>
15-
<build_depend>rqt_gui_py</build_depend>
16-
<build_depend>image_recognition_msgs</build_depend>
17-
<build_depend>image_recognition_util</build_depend>
18-
19-
<run_depend>rospy</run_depend>
20-
<run_depend>rqt_gui</run_depend>
21-
<run_depend>rqt_gui_py</run_depend>
22-
<run_depend>image_recognition_msgs</run_depend>
23-
<run_depend>image_recognition_util</run_depend>
13+
<exec_depend>image_recognition_msgs</exec_depend>
14+
<exec_depend>image_recognition_util</exec_depend>
15+
<exec_depend>rospy</exec_depend>
16+
<exec_depend>rqt_gui</exec_depend>
17+
<exec_depend>rqt_gui_py</exec_depend>
2418

2519
<!-- The export tag contains other, unspecified, tags -->
2620
<export>

image_recognition_skybiometry/package.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66

77
<maintainer email="[email protected]">Rein Appeldoorn</maintainer>
88

9-
<license>TODO</license>
9+
<license>MIT</license>
1010

1111
<buildtool_depend>catkin</buildtool_depend>
12+
1213
<exec_depend>cv_bridge</exec_depend>
1314
<exec_depend>diagnostic_updater</exec_depend>
1415
<exec_depend>image_recognition_msgs</exec_depend>
Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
11
<?xml version="1.0"?>
2-
<package>
2+
<package format="2">
33
<name>image_recognition_tensorflow</name>
44
<version>0.0.4</version>
55
<description>The image_recognition_tensorflow package</description>
66

77
<maintainer email="[email protected]">Rein Appeldoorn</maintainer>
88

9-
<license>TODO</license>
9+
<license>MIT</license>
1010

1111
<buildtool_depend>catkin</buildtool_depend>
12-
<build_depend>rospy</build_depend>
13-
<build_depend>image_recognition_msgs</build_depend>
14-
<build_depend>image_recognition_util</build_depend>
15-
16-
<run_depend>rospy</run_depend>
17-
<run_depend>image_recognition_msgs</run_depend>
18-
<run_depend>image_recognition_util</run_depend>
19-
<run_depend>python-numpy</run_depend>
20-
<run_depend>python-six</run_depend>
21-
<run_depend>python-tensorflow-pip</run_depend>
22-
<run_depend>diagnostic_updater</run_depend>
2312

13+
<exec_depend>diagnostic_updater</exec_depend>
14+
<exec_depend>image_recognition_msgs</exec_depend>
15+
<exec_depend>image_recognition_util</exec_depend>
16+
<exec_depend>python-numpy</exec_depend>
17+
<exec_depend>python-six</exec_depend>
18+
<exec_depend>python-tensorflow-pip</exec_depend>
19+
<exec_depend>rospy</exec_depend>
2420
</package>

0 commit comments

Comments
 (0)