Allow specification of additional packages in workspaces

colcon_cargo/package_identification/cargo_workspace.py

@@ -50,6 +50,14 @@ def identify(self, metadata):  # noqa: D102
         )
         self.workspace_package_paths.update(ws_members)
 
+        workspace_metadata = content['workspace'].get('metadata', {})
+        colcon_metadata = workspace_metadata.get('colcon', {})
+        self.workspace_package_paths.update(
+            member
+            for pattern in colcon_metadata.get('additional-packages', ())
+            for member in metadata.path.glob(pattern)
+        )
+
         if 'package' not in content:
             # Prevent any further attempts to discover packages in this
             # directory and let the workspace dictate where to look for

test/rust-workspace/Cargo.toml

@@ -7,3 +7,6 @@ edition = "2018"
 [workspace]
 members = ["workspace-mem*"]
 default-members = ["workspace-mem*"]
+
+[workspace.metadata.colcon]
+additional-packages = ["additional-pack*"]

test/rust-workspace/additional-package/Cargo.toml

@@ -0,0 +1,5 @@
+[package]
+name = "additional-package"
+version = "0.1.0"
+authors = ["Test<test@test.com>"]
+edition = "2018"

test/rust-workspace/additional-package/src/main.rs

@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}

test/test_build.py

@@ -98,10 +98,14 @@ def test_package_discovery():
             cpi.PRIORITY: {'cargo': cpi},
         })
 
-    assert len(descs) == 1
+    assert len(descs) == 2
+    descs = sorted(descs, key=lambda d: d.name)
     desc = descs.pop()
     assert desc.type == 'cargo'
     assert desc.name == 'workspace-member'
+    desc = descs.pop()
+    assert desc.type == 'cargo'
+    assert desc.name == 'additional-package'
 
 
 # Ported from Python 3.13 implementation