Declare frontend group dependency & use explicit dependencies in laun…

…ch_testing (ros2#520) * Switch to package format 3 Signed-off-by: Christophe Bedard <[email protected]> * Declare dependency on launch_{xml,yaml} in launch_testing Signed-off-by: Christophe Bedard <[email protected]> * Declare a 'launch_frontend_packages' group and use in launch_testing Signed-off-by: Christophe Bedard <[email protected]>
nlamprian · Nov 23, 2021 · a7657a5 · a7657a5
1 parent 81085cf
commit a7657a5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/launch_testing/package.xml b/launch_testing/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
-<package format="2">
+<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
+<package format="3">
   <name>launch_testing</name>
   <version>0.19.0</version>
   <description>A package to create tests which involve launch files and multiple processes.</description>
@@ -17,6 +17,9 @@
 
   <exec_depend>ament_index_python</exec_depend>
   <exec_depend>launch</exec_depend>
+  <!-- explicitly depend on the main launch frontends -->
+  <exec_depend>launch_xml</exec_depend>
+  <exec_depend>launch_yaml</exec_depend>
   <exec_depend>osrf_pycommon</exec_depend>
   <exec_depend>python3-pytest</exec_depend>
 
@@ -25,6 +28,8 @@
   <test_depend>ament_pep257</test_depend>
   <test_depend>launch</test_depend>
 
+  <group_depend>launch_frontend_packages</group_depend>
+
   <export>
     <build_type>ament_python</build_type>
   </export>

diff --git a/launch_xml/package.xml b/launch_xml/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
-<package format="2">
+<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
+<package format="3">
   <name>launch_xml</name>
   <version>0.19.0</version>
   <description>XML frontend for the launch package.</description>
@@ -20,6 +20,8 @@
   <test_depend>ament_pep257</test_depend>
   <test_depend>python3-pytest</test_depend>
 
+  <member_of_group>launch_frontend_packages</member_of_group>
+
   <export>
     <build_type>ament_python</build_type>
   </export>

diff --git a/launch_yaml/package.xml b/launch_yaml/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
-<package format="2">
+<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
+<package format="3">
   <name>launch_yaml</name>
   <version>0.19.0</version>
   <description>YAML frontend for the launch package.</description>
@@ -20,6 +20,8 @@
   <test_depend>ament_pep257</test_depend>
   <test_depend>python3-pytest</test_depend>
 
+  <member_of_group>launch_frontend_packages</member_of_group>
+
   <export>
     <build_type>ament_python</build_type>
   </export>