Create a proper Cargo worksace and move r2r source to r2r/ dir

2022-11-25 00:14:14 +08:00 · 2022-11-25 00:14:14 +08:00 · e39887b038
parent 1955bdda3b
commit e39887b038
46 changed files with 43 additions and 38 deletions
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,39 +1,8 @@
-
-[package]
-name = "r2r"
-version = "0.6.3"
-authors = ["Martin Dahl <martin.dahl@gmail.com>"]
-description = "Easy to use, runtime-agnostic, async rust bindings for ROS2."
-license = "MIT AND Apache-2.0"
-edition = "2021"
-readme = "README.md"
-homepage = "https://github.com/sequenceplanner/r2r"
-repository = "https://github.com/sequenceplanner/r2r"
-documentation = "https://sequenceplanner.github.io/r2r/"
-
-[lib]
-doctest = false
-
-[dependencies]
-serde = { version = "1.0.133", features = ["derive"] }
-serde_json = "1.0.74"
-thiserror = "1.0.30"
-lazy_static = "1.4.0"
-r2r_common = { path = "r2r_common", version = "0.3.2" }
-r2r_rcl = { path = "r2r_rcl", version = "0.3.2" }
-r2r_msg_gen = { path = "r2r_msg_gen", version = "0.3.3" }
-r2r_actions = { path = "r2r_actions", version = "0.3.2" }
-uuid = { version = "0.8.2", features = ["serde", "v4"] }
-futures = "0.3.19"
-
-[dev-dependencies]
-serde_json = "1.0.74"
-futures = "0.3.19"
-tokio = { version = "1.15.0", features = ["full"] }
-rand = "0.8.4"
-
-[build-dependencies]
-r2r_common = { path = "r2r_common", version = "0.3.2" }
-r2r_msg_gen = { path = "r2r_msg_gen", version = "0.3.3" }
-
 [workspace]
+members = [
+    "r2r",
+    "r2r_actions",
+    "r2r_common",
+    "r2r_msg_gen",
+    "r2r_rcl",
+]
--- a/r2r/Cargo.toml
+++ b/r2r/Cargo.toml
@ -0,0 +1,36 @@
+[package]
+name = "r2r"
+version = "0.6.3"
+authors = ["Martin Dahl <martin.dahl@gmail.com>"]
+description = "Easy to use, runtime-agnostic, async rust bindings for ROS2."
+license = "MIT AND Apache-2.0"
+edition = "2021"
+readme = "README.md"
+homepage = "https://github.com/sequenceplanner/r2r"
+repository = "https://github.com/sequenceplanner/r2r"
+documentation = "https://sequenceplanner.github.io/r2r/"
+
+[lib]
+doctest = false
+
+[dependencies]
+serde = { version = "1.0.133", features = ["derive"] }
+serde_json = "1.0.74"
+thiserror = "1.0.30"
+lazy_static = "1.4.0"
+r2r_common = { path = "../r2r_common", version = "0.3.2" }
+r2r_rcl = { path = "../r2r_rcl", version = "0.3.2" }
+r2r_msg_gen = { path = "../r2r_msg_gen", version = "0.3.3" }
+r2r_actions = { path = "../r2r_actions", version = "0.3.2" }
+uuid = { version = "0.8.2", features = ["serde", "v4"] }
+futures = "0.3.19"
+
+[dev-dependencies]
+serde_json = "1.0.74"
+futures = "0.3.19"
+tokio = { version = "1.15.0", features = ["full"] }
+rand = "0.8.4"
+
+[build-dependencies]
+r2r_common = { path = "../r2r_common", version = "0.3.2" }
+r2r_msg_gen = { path = "../r2r_msg_gen", version = "0.3.3" }
--- a/r2r/build.rs
+++ b/r2r/build.rs
--- a/r2r/examples/action_client.rs
+++ b/r2r/examples/action_client.rs
--- a/r2r/examples/action_client_untyped.rs
+++ b/r2r/examples/action_client_untyped.rs
--- a/r2r/examples/action_server.rs
+++ b/r2r/examples/action_server.rs
--- a/r2r/examples/client.rs
+++ b/r2r/examples/client.rs
--- a/r2r/examples/clock.rs
+++ b/r2r/examples/clock.rs
--- a/r2r/examples/logging.rs
+++ b/r2r/examples/logging.rs
--- a/r2r/examples/parameters.rs
+++ b/r2r/examples/parameters.rs
--- a/r2r/examples/publishers.rs
+++ b/r2r/examples/publishers.rs
--- a/r2r/examples/rostopic_echo.rs
+++ b/r2r/examples/rostopic_echo.rs
--- a/r2r/examples/rostopic_list.rs
+++ b/r2r/examples/rostopic_list.rs
--- a/r2r/examples/service.rs
+++ b/r2r/examples/service.rs
--- a/r2r/examples/subscriber.rs
+++ b/r2r/examples/subscriber.rs
--- a/r2r/examples/tokio.rs
+++ b/r2r/examples/tokio.rs
--- a/r2r/examples/tokio_client.rs
+++ b/r2r/examples/tokio_client.rs
--- a/r2r/examples/tokio_examples.rs
+++ b/r2r/examples/tokio_examples.rs
--- a/r2r/examples/tokio_publisher.rs
+++ b/r2r/examples/tokio_publisher.rs
--- a/r2r/examples/tokio_service.rs
+++ b/r2r/examples/tokio_service.rs
--- a/r2r/examples/tokio_subscriber.rs
+++ b/r2r/examples/tokio_subscriber.rs
--- a/r2r/examples/untyped_client.rs
+++ b/r2r/examples/untyped_client.rs
--- a/r2r/examples/wall_timer.rs
+++ b/r2r/examples/wall_timer.rs
--- a/r2r/src/action_clients.rs
+++ b/r2r/src/action_clients.rs
--- a/r2r/src/action_clients_untyped.rs
+++ b/r2r/src/action_clients_untyped.rs
--- a/r2r/src/action_common.rs
+++ b/r2r/src/action_common.rs
--- a/r2r/src/action_servers.rs
+++ b/r2r/src/action_servers.rs
--- a/r2r/src/clients.rs
+++ b/r2r/src/clients.rs
--- a/r2r/src/clocks.rs
+++ b/r2r/src/clocks.rs
--- a/r2r/src/context.rs
+++ b/r2r/src/context.rs
--- a/r2r/src/error.rs
+++ b/r2r/src/error.rs
--- a/r2r/src/lib.rs
+++ b/r2r/src/lib.rs
--- a/r2r/src/msg_types.rs
+++ b/r2r/src/msg_types.rs
--- a/r2r/src/nodes.rs
+++ b/r2r/src/nodes.rs
--- a/r2r/src/parameters.rs
+++ b/r2r/src/parameters.rs
--- a/r2r/src/publishers.rs
+++ b/r2r/src/publishers.rs
--- a/r2r/src/qos.rs
+++ b/r2r/src/qos.rs
--- a/r2r/src/services.rs
+++ b/r2r/src/services.rs
--- a/r2r/src/subscribers.rs
+++ b/r2r/src/subscribers.rs
--- a/r2r/src/utils.rs
+++ b/r2r/src/utils.rs
--- a/r2r/tests/Dockerfile
+++ b/r2r/tests/Dockerfile
--- a/r2r/tests/Dockerfile_foxy
+++ b/r2r/tests/Dockerfile_foxy
--- a/r2r/tests/Dockerfile_galactic
+++ b/r2r/tests/Dockerfile_galactic
--- a/r2r/tests/test.sh
+++ b/r2r/tests/test.sh
--- a/r2r/tests/threads.rs
+++ b/r2r/tests/threads.rs
--- a/r2r/tests/tokio_testing.rs
+++ b/r2r/tests/tokio_testing.rs