From 818b2aa6e82f8e2f563d50be9d1c0f6ec3de8a62 Mon Sep 17 00:00:00 2001 From: Michael Ilyin Date: Fri, 12 Jan 2024 18:13:28 +0100 Subject: [PATCH] long version field used --- Cargo.lock | 127 ++++++++++++------------ zenoh-bridge-ros2dds/src/bridge_args.rs | 5 +- zenoh-bridge-ros2dds/src/main.rs | 2 +- zenoh-plugin-ros2dds/src/lib.rs | 6 +- 4 files changed, 73 insertions(+), 67 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d0f93cf..afb2aec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -128,9 +128,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.5" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" +checksum = "4cd2405b3ac1faab2990b74d728624cd9fd115651fcecc7c2d8daf01376275ba" dependencies = [ "anstyle", "anstyle-parse", @@ -526,9 +526,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.6" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79fed4cdb43e993fcdadc7e58a09fd0e3e649c4436fa11da71c9f1f3ee7feb9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -761,9 +761,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.14" +version = "4.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33e92c5c1a78c62968ec57dbc2440366a2d6e5a23faf829970ff1585dc6b18e2" +checksum = "58e54881c004cec7895b0068a0a954cd5d62da01aef83fa35b1e594497bf5445" dependencies = [ "clap_builder", "clap_derive", @@ -771,9 +771,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.14" +version = "4.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4323769dc8a61e2c39ad7dc26f6f2800524691a44d74fe3d1071a5c24db6370" +checksum = "59cb82d7f531603d2fd1f507441cdd35184fa81beff7bd489570de7f773460bb" dependencies = [ "anstream", "anstyle", @@ -1443,9 +1443,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.22" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "b553656127a00601c8ae5590fcfdc118e4083a7924b6cf4ffc1ea4b99dc429d7" dependencies = [ "bytes", "fnv", @@ -1764,9 +1764,9 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" dependencies = [ "wasm-bindgen", ] @@ -1790,7 +1790,7 @@ checksum = "2a071f4f7efc9a9118dfb627a0a94ef247986e1ab8606a4c806ae2b3aa3b6978" dependencies = [ "ahash", "anyhow", - "base64 0.21.6", + "base64 0.21.7", "bytecount", "clap", "fancy-regex", @@ -1921,9 +1921,9 @@ dependencies = [ [[package]] name = "lz4_flex" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ea9b256699eda7b0387ffbc776dd625e28bde3918446381781245b7a50349d8" +checksum = "912b45c753ff5f7f5208307e8ace7d2a2e30d024e26d3509f3dce546c044ce15" dependencies = [ "twox-hash", ] @@ -2687,7 +2687,7 @@ version = "0.11.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" dependencies = [ - "base64 0.21.6", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", @@ -2881,7 +2881,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.6", + "base64 0.21.7", ] [[package]] @@ -2890,7 +2890,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35e4980fa29e4c4b212ffb3db068a564cbf560e51d3944b7c88bd8bf5bec64f4" dependencies = [ - "base64 0.21.6", + "base64 0.21.7", "rustls-pki-types", ] @@ -3482,9 +3482,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -3975,9 +3975,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" dependencies = [ "cfg-if 1.0.0", "serde", @@ -3987,9 +3987,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" dependencies = [ "bumpalo", "log", @@ -4002,9 +4002,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.39" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -4014,9 +4014,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4024,9 +4024,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" dependencies = [ "proc-macro2", "quote", @@ -4037,15 +4037,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" [[package]] name = "web-sys" -version = "0.3.66" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" dependencies = [ "js-sys", "wasm-bindgen", @@ -4257,12 +4257,12 @@ dependencies = [ [[package]] name = "zenoh" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#c960dc483dfe0967d4fc97625c2cb8fb3e51c978" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#39f49d8d32ba6a4a586dcc3aa353ae9b52017801" dependencies = [ "async-global-executor", "async-std", "async-trait", - "base64 0.21.6", + "base64 0.21.7", "const_format", "env_logger", "event-listener 4.0.3", @@ -4323,7 +4323,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#c960dc483dfe0967d4fc97625c2cb8fb3e51c978" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#39f49d8d32ba6a4a586dcc3aa353ae9b52017801" dependencies = [ "zenoh-collections", ] @@ -4331,7 +4331,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#c960dc483dfe0967d4fc97625c2cb8fb3e51c978" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#39f49d8d32ba6a4a586dcc3aa353ae9b52017801" dependencies = [ "log", "serde", @@ -4343,12 +4343,12 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#c960dc483dfe0967d4fc97625c2cb8fb3e51c978" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#39f49d8d32ba6a4a586dcc3aa353ae9b52017801" [[package]] name = "zenoh-config" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#c960dc483dfe0967d4fc97625c2cb8fb3e51c978" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#39f49d8d32ba6a4a586dcc3aa353ae9b52017801" dependencies = [ "flume", "json5", @@ -4367,7 +4367,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#c960dc483dfe0967d4fc97625c2cb8fb3e51c978" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#39f49d8d32ba6a4a586dcc3aa353ae9b52017801" dependencies = [ "async-std", "lazy_static", @@ -4377,7 +4377,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#c960dc483dfe0967d4fc97625c2cb8fb3e51c978" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#39f49d8d32ba6a4a586dcc3aa353ae9b52017801" dependencies = [ "aes 0.8.3", "hmac 0.12.1", @@ -4390,7 +4390,7 @@ dependencies = [ [[package]] name = "zenoh-ext" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#c960dc483dfe0967d4fc97625c2cb8fb3e51c978" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#39f49d8d32ba6a4a586dcc3aa353ae9b52017801" dependencies = [ "async-std", "bincode", @@ -4410,7 +4410,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#c960dc483dfe0967d4fc97625c2cb8fb3e51c978" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#39f49d8d32ba6a4a586dcc3aa353ae9b52017801" dependencies = [ "hashbrown 0.14.3", "keyed-set", @@ -4424,7 +4424,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#c960dc483dfe0967d4fc97625c2cb8fb3e51c978" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#39f49d8d32ba6a4a586dcc3aa353ae9b52017801" dependencies = [ "async-std", "async-trait", @@ -4443,7 +4443,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#c960dc483dfe0967d4fc97625c2cb8fb3e51c978" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#39f49d8d32ba6a4a586dcc3aa353ae9b52017801" dependencies = [ "async-std", "async-trait", @@ -4460,12 +4460,12 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#c960dc483dfe0967d4fc97625c2cb8fb3e51c978" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#39f49d8d32ba6a4a586dcc3aa353ae9b52017801" dependencies = [ "async-rustls", "async-std", "async-trait", - "base64 0.21.6", + "base64 0.21.7", "futures", "log", "quinn", @@ -4486,7 +4486,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#c960dc483dfe0967d4fc97625c2cb8fb3e51c978" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#39f49d8d32ba6a4a586dcc3aa353ae9b52017801" dependencies = [ "async-std", "async-trait", @@ -4502,12 +4502,12 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#c960dc483dfe0967d4fc97625c2cb8fb3e51c978" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#39f49d8d32ba6a4a586dcc3aa353ae9b52017801" dependencies = [ "async-rustls", "async-std", "async-trait", - "base64 0.21.6", + "base64 0.21.7", "futures", "log", "rustls", @@ -4527,7 +4527,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#c960dc483dfe0967d4fc97625c2cb8fb3e51c978" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#39f49d8d32ba6a4a586dcc3aa353ae9b52017801" dependencies = [ "async-std", "async-trait", @@ -4546,7 +4546,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#c960dc483dfe0967d4fc97625c2cb8fb3e51c978" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#39f49d8d32ba6a4a586dcc3aa353ae9b52017801" dependencies = [ "async-std", "async-trait", @@ -4564,7 +4564,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#c960dc483dfe0967d4fc97625c2cb8fb3e51c978" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#39f49d8d32ba6a4a586dcc3aa353ae9b52017801" dependencies = [ "async-std", "async-trait", @@ -4584,7 +4584,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#c960dc483dfe0967d4fc97625c2cb8fb3e51c978" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#39f49d8d32ba6a4a586dcc3aa353ae9b52017801" dependencies = [ "proc-macro2", "quote", @@ -4597,12 +4597,13 @@ dependencies = [ [[package]] name = "zenoh-plugin-rest" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#c960dc483dfe0967d4fc97625c2cb8fb3e51c978" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#39f49d8d32ba6a4a586dcc3aa353ae9b52017801" dependencies = [ "anyhow", "async-std", - "base64 0.21.6", + "base64 0.21.7", "clap", + "const_format", "env_logger", "flume", "futures", @@ -4654,7 +4655,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#c960dc483dfe0967d4fc97625c2cb8fb3e51c978" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#39f49d8d32ba6a4a586dcc3aa353ae9b52017801" dependencies = [ "const_format", "libloading", @@ -4670,7 +4671,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#c960dc483dfe0967d4fc97625c2cb8fb3e51c978" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#39f49d8d32ba6a4a586dcc3aa353ae9b52017801" dependencies = [ "const_format", "hex", @@ -4686,7 +4687,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#c960dc483dfe0967d4fc97625c2cb8fb3e51c978" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#39f49d8d32ba6a4a586dcc3aa353ae9b52017801" dependencies = [ "anyhow", ] @@ -4694,7 +4695,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#c960dc483dfe0967d4fc97625c2cb8fb3e51c978" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#39f49d8d32ba6a4a586dcc3aa353ae9b52017801" dependencies = [ "async-std", "event-listener 4.0.3", @@ -4709,7 +4710,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#c960dc483dfe0967d4fc97625c2cb8fb3e51c978" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#39f49d8d32ba6a4a586dcc3aa353ae9b52017801" dependencies = [ "async-executor", "async-global-executor", @@ -4740,7 +4741,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "0.11.0-dev" -source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#c960dc483dfe0967d4fc97625c2cb8fb3e51c978" +source = "git+https://github.com/eclipse-zenoh/zenoh?branch=simplified_load_plugin#39f49d8d32ba6a4a586dcc3aa353ae9b52017801" dependencies = [ "async-std", "async-trait", diff --git a/zenoh-bridge-ros2dds/src/bridge_args.rs b/zenoh-bridge-ros2dds/src/bridge_args.rs index 6381b4d..b5e1dec 100644 --- a/zenoh-bridge-ros2dds/src/bridge_args.rs +++ b/zenoh-bridge-ros2dds/src/bridge_args.rs @@ -15,13 +15,14 @@ use crate::zenoh_args::CommonArgs; use clap::builder::FalseyValueParser; use zenoh::config::Config; use zenoh::prelude::*; +use zenoh_plugin_trait::Plugin; // // All Bridge arguments // #[derive(clap::Parser, Clone, Debug)] -#[command(version=zenoh_plugin_ros2dds::GIT_VERSION, - long_version=zenoh_plugin_ros2dds::LONG_VERSION.as_str(), +#[command(version=zenoh_plugin_ros2dds::ROS2Plugin::PLUGIN_VERSION, + long_version=zenoh_plugin_ros2dds::ROS2Plugin::PLUGIN_LONG_VERSION, about="Zenoh bridge for ROS 2 with a DDS RMW", )] pub struct BridgeArgs { diff --git a/zenoh-bridge-ros2dds/src/main.rs b/zenoh-bridge-ros2dds/src/main.rs index a53a0ce..b2d1718 100644 --- a/zenoh-bridge-ros2dds/src/main.rs +++ b/zenoh-bridge-ros2dds/src/main.rs @@ -30,7 +30,7 @@ async fn main() { env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("z=info")).init(); log::info!( "zenoh-bridge-ros2dds {}", - *zenoh_plugin_ros2dds::LONG_VERSION + zenoh_plugin_ros2dds::ROS2Plugin::PLUGIN_LONG_VERSION ); let (watchdog_period, config) = parse_args(); diff --git a/zenoh-plugin-ros2dds/src/lib.rs b/zenoh-plugin-ros2dds/src/lib.rs index 372d3c8..c2f3abd 100644 --- a/zenoh-plugin-ros2dds/src/lib.rs +++ b/zenoh-plugin-ros2dds/src/lib.rs @@ -31,7 +31,7 @@ use zenoh::Result as ZResult; use zenoh::Session; use zenoh_core::{bail, zerror}; use zenoh_ext::SubscriberBuilderExt; -use zenoh_plugin_trait::{plugin_version, Plugin, PluginControl}; +use zenoh_plugin_trait::{plugin_long_version, plugin_version, Plugin, PluginControl}; use zenoh_util::Timed; pub mod config; @@ -71,6 +71,9 @@ macro_rules! ke_for_sure { } lazy_static::lazy_static!( + pub static ref VERSION_JSON_VALUE: Value = + serde_json::Value::String(ROS2Plugin::PLUGIN_LONG_VERSION.to_owned()).into(); + static ref LOG_PAYLOAD: bool = std::env::var("Z_LOG_PAYLOAD").is_ok(); static ref KE_ANY_1_SEGMENT: &'static keyexpr = ke_for_sure!("*"); @@ -111,6 +114,7 @@ impl Plugin for ROS2Plugin { type Instance = RunningPlugin; const PLUGIN_VERSION: &'static str = plugin_version!(); + const PLUGIN_LONG_VERSION: &'static str = plugin_long_version!(); const DEFAULT_NAME: &'static str = "zenoh-plugin-ros2dds"; fn start(name: &str, runtime: &Self::StartArgs) -> ZResult {