Merge pull request #315 from DenisBiryukov91/api-rework

Sample/Payload api rework
eclipse-zenoh · Apr 8, 2024 · c97aec4 · c97aec4
2 parents db9733e + 0275363
commit c97aec4
Show file tree

Hide file tree

Showing 55 changed files with 3,948 additions and 811 deletions.
diff --git a/.gitignore b/.gitignore
@@ -70,4 +70,8 @@ dkms.conf
 .cache
 
 # Platform dependent generated files
-include/zenoh_configure.h
+include/zenoh_configure.h
+
+# Build resources
+.build_resources*
+src/opaque_types/mod.rs
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,7 +27,7 @@ declare_cache_var_true_if_vscode(ZENOHC_BUILD_IN_SOURCE_TREE "Do build inside so
 declare_cache_var(ZENOHC_BUILD_WITH_LOGGER_AUTOINIT TRUE BOOL "Enable logger-autoinit zenoh-c feature")
 declare_cache_var(ZENOHC_BUILD_WITH_SHARED_MEMORY TRUE BOOL "Enable shared-memory zenoh-c feature")
 declare_cache_var(ZENOHC_CUSTOM_TARGET "" STRING "Rust target for cross compilation, 'aarch64-unknown-linux-gnu' for example")
-declare_cache_var(ZENOHC_CARGO_CHANNEL "stable" STRING "Cargo channel selected: stable or nightly")
+declare_cache_var(ZENOHC_CARGO_CHANNEL "" STRING "Cargo channel parameter. Should be '+stable', '+nightly' or empty value")
 declare_cache_var(ZENOHC_CARGO_FLAGS "" STRING "Additional cargo flags")
 declare_cache_var(ZENOHC_LIB_STATIC FALSE BOOL "Alias zenohc::lib target to zenohc::static if TRUE, to zenohc::shared if FALSE")
 
@@ -198,8 +198,8 @@ file(GLOB_RECURSE rust_sources "Cargo.toml.in" "src/*.rs" "build.rs" "splitguide
 add_custom_command(
 	OUTPUT ${libs}
 	COMMAND ${CMAKE_COMMAND} -E echo \"RUSTFLAGS = $$RUSTFLAGS\"
-	COMMAND ${CMAKE_COMMAND} -E echo \"cargo +${ZENOHC_CARGO_CHANNEL} build ${cargo_flags}\"
-	COMMAND cargo +${ZENOHC_CARGO_CHANNEL} build ${cargo_flags}
+	COMMAND ${CMAKE_COMMAND} -E echo \"cargo ${ZENOHC_CARGO_CHANNEL} build ${cargo_flags}\"
+	COMMAND cargo ${ZENOHC_CARGO_CHANNEL} build ${cargo_flags}
 	VERBATIM
 	COMMAND_EXPAND_LISTS
 	DEPENDS "${rust_sources}"

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -59,6 +59,7 @@ zenoh-ext = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/ze
 [build-dependencies]
 cbindgen = "0.24.3"
 fs2 = "0.4.3"
+regex = "1.7.1"
 serde_yaml = "0.9.19"
 
 [lib]

diff --git a/Cargo.toml.in b/Cargo.toml.in
@@ -59,6 +59,7 @@ zenoh-ext = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/ze
 [build-dependencies]
 cbindgen = "0.24.3"
 fs2 = "0.4.3"
+regex = "1.7.1"
 serde_yaml = "0.9.19"
 
 [lib]