From ec1b4dca265cd51f694a13fc5e1432b8545069d2 Mon Sep 17 00:00:00 2001 From: Michael Ilyin Date: Thu, 22 Feb 2024 16:26:30 +0300 Subject: [PATCH] version restored, readme updated --- Cargo.lock | 50 +++++++++++++++++++++++++------------------------- Cargo.toml | 14 +++++++------- README.md | 15 +++------------ 3 files changed, 35 insertions(+), 44 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0fa0786..4ecf6eb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4139,7 +4139,7 @@ dependencies = [ [[package]] name = "zenoh" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "async-global-executor", "async-std", @@ -4205,7 +4205,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "zenoh-collections", ] @@ -4213,7 +4213,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "log", "serde", @@ -4225,12 +4225,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" [[package]] name = "zenoh-config" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "flume", "json5", @@ -4249,7 +4249,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "async-std", "lazy_static", @@ -4259,7 +4259,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "aes 0.8.3", "hmac 0.12.1", @@ -4272,7 +4272,7 @@ dependencies = [ [[package]] name = "zenoh-ext" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "async-std", "bincode", @@ -4292,7 +4292,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "hashbrown 0.14.0", "keyed-set", @@ -4306,7 +4306,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "async-std", "async-trait", @@ -4325,7 +4325,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "async-std", "async-trait", @@ -4342,7 +4342,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "async-rustls", "async-std", @@ -4368,7 +4368,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "async-std", "async-trait", @@ -4384,7 +4384,7 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "async-rustls", "async-std", @@ -4409,7 +4409,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "async-std", "async-trait", @@ -4428,7 +4428,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "async-std", "async-trait", @@ -4446,7 +4446,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "async-std", "async-trait", @@ -4466,7 +4466,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "proc-macro2", "quote", @@ -4479,7 +4479,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-rest" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "anyhow", "async-std", @@ -4537,7 +4537,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "const_format", "libloading", @@ -4553,7 +4553,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "const_format", "hex", @@ -4569,7 +4569,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "anyhow", ] @@ -4577,7 +4577,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "async-std", "event-listener 4.0.0", @@ -4592,7 +4592,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "async-executor", "async-global-executor", @@ -4623,7 +4623,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#8cd786f2192fd2aa7387432ae93cdd78f5db1df2" dependencies = [ "async-std", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index 2e1d39a..2896e21 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,17 +43,17 @@ regex = "1.7.1" rustc_version = "0.4" serde = "1.0.154" serde_json = "1.0.94" -zenoh = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "main", features = [ +zenoh = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = [ "unstable", ] } -zenoh-collections = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "main" } -zenoh-core = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "main" } -zenoh-ext = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "main", features = [ +zenoh-collections = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" } +zenoh-core = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" } +zenoh-ext = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = [ "unstable", ] } -zenoh-plugin-rest = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "main", default-features = false } -zenoh-plugin-trait = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "main", default-features = false } -zenoh-util = { git = "https://github.com/eclipse-zenoh/zenoh", branch = "main", default-features = false } +zenoh-plugin-rest = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", default-features = false } +zenoh-plugin-trait = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", default-features = false } +zenoh-util = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", default-features = false } [profile.release] debug = false diff --git a/README.md b/README.md index a020780..82340a0 100644 --- a/README.md +++ b/README.md @@ -105,21 +105,12 @@ Once these dependencies are in place, you may clone the repository on your machi ```bash $ git clone https://github.com/eclipse-zenoh/zenoh-plugin-ros2dds.git $ cd zenoh-plugin-ros2dds +$ cargo build --release ``` -> :warning: **WARNING** :warning: : On Linux, don't use `cargo build` command without specifying a package with `-p`. Building both `zenoh-plugin-ros2dds` (plugin library) and `zenoh-bridge-ros2dds` (standalone executable) together will lead to a `multiple definition of `load_plugin'` error at link time. See [#117](https://github.com/eclipse-zenoh/zenoh-plugin-dds/issues/117#issuecomment-1439694331) for explanations. -You can then choose between building the zenoh bridge for DDS: -- as a plugin library that can be dynamically loaded by the zenoh router (`zenohd`): -```bash -$ cargo build --release -p zenoh-plugin-ros2dds -``` -The plugin shared library (`*.so` on Linux, `*.dylib` on Mac OS, `*.dll` on Windows) will be generated in the `target/release` subdirectory. +The standalone executable binary `zenoh-bridge-ros2dds` and a plugin shared library (`*.so` on Linux, `*.dylib` on Mac OS, `*.dll` on Windows) to be dynamically +loaded by the zenoh router `zenohd` will be generated in the `target/release` subdirectory. -- or as a standalone executable binary: -```bash -$ cargo build --release -p zenoh-bridge-ros2dds -``` -The **`zenoh-bridge-ros2dds`** binary will be generated in the `target/release` sub-directory. ## ROS 2 package You can also build `zenoh-bridge-ros2dds` as a ROS package running: