1.8.0-beta.6: Prepare final version

Author: DoumanAsh

.github/workflows/rust.yml

@@ -48,4 +48,4 @@ jobs:
       run: cargo test
 
     - name: Test
-      run: cargo test --features http,tls
+      run: cargo test --features http,websocket,stats

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nng-c-sys"
-version = "1.8.0-beta.5"
+version = "1.8.0-beta.6"
 authors = ["Douman <[email protected]>"]
 edition = "2018"
 keywords = ["nng", "nanomsg"]
@@ -22,5 +22,9 @@ version = "0.1"
 build-bindgen = ["bindgen"]
 # Enables HTTP transport code
 http = []
+# Enables Websocket transport code (this automatically enables http transport)
+websocket = ["http"]
 # Enables TLS
 tls = []
+# Enables statistics
+stats = []

README.md

@@ -11,8 +11,16 @@ Version corresponds to C library
 ## Features
 
 - `http` - Builds with http code ON
+- `websocket` - Builds with websocket code ON. Enables `http` alongside
 - `tls` - Builds with TLS code ON
+- `stats` - Builds with statistics collection. See [this](https://nng.nanomsg.org/man/v1.3.0/nng_stat.5.html) for details.
 
 ### TLS
 
 When `tls` feature is enabled this crate compiles mbedtls 2.28.8 to bundle it together with `nng`
+
+## Cross compilation
+
+### Android
+
+Specify environment variable `ANDROID_NDK_HOME` which points too root of NDK installation where to look for toolchain file

build.rs

@@ -1,3 +1,5 @@
+use std::env;
+use std::path::PathBuf;
 use std::process::Command;
 
 const INCLUDE_PATH: &str = "nng/include";
@@ -127,11 +129,54 @@ pub const NNG_FLAG_NONBLOCK: core::ffi::c_int = 2;
 #[cfg(not(feature = "build-bindgen"))]
 fn generate_lib() {}
 
+fn get_android_vars() -> Option<(PathBuf, &'static str)> {
+    if let Ok(android_ndk) = env::var("ANDROID_NDK_HOME") {
+        let mut toolchain_file = PathBuf::new();
+        toolchain_file.push(android_ndk);
+        toolchain_file.push("build");
+        toolchain_file.push("cmake");
+        toolchain_file.push("android.toolchain.cmake");
+
+        let target = env::var("TARGET").unwrap();
+        let abi = match target.as_str() {
+            "armv7-linux-androideabi" => "armeabi-v7a",
+            "aarch64-linux-android" => "arm64-v8a",
+            "i686-linux-android" => "x86",
+            "x86_64-linux-android" => "x86_64",
+            _ => return None,
+        };
+
+        Some((toolchain_file, abi))
+    } else {
+        None
+    }
+}
+
+fn set_cmake_define_if_present(config: &mut cmake::Config, name: &str) {
+    if let Ok(value) = env::var(name) {
+        config.define(name, value);
+    } else if let Ok(value) = env::var(format!("CARGO_NDK_{}", name)) {
+        config.define(name, value);
+    } else {
+        println!("cargo:warning=Unable to find Android env variable '{}'. Hope for good default...", name);
+    }
+}
+
 #[cfg(feature = "tls")]
 fn build_mbedtls(nng: &mut cmake::Config, is_ninja: bool) {
     const MBEDTLS: &str = "mbedtls-2.28.8";
     let mut config = cmake::Config::new(MBEDTLS);
 
+    if let Some((toolchain_file, abi)) = get_android_vars() {
+        config.define("CMAKE_TOOLCHAIN_FILE", toolchain_file);
+        config.define("ANDROID_ABI", abi);
+
+        set_cmake_define_if_present(&mut config, "ANDROID_PLATFORM");
+        set_cmake_define_if_present(&mut config, "ANDROID_STL");
+        set_cmake_define_if_present(&mut config, "ANDROID_ARM_MODE");
+        set_cmake_define_if_present(&mut config, "ANDROID_ARM_NEON");
+    }
+
     if is_ninja {
         config.generator("Ninja");
     }
@@ -161,23 +206,50 @@ fn build() {
 
     let mut config = cmake::Config::new("nng");
 
+    if let Some((toolchain_file, abi)) = get_android_vars() {
+        config.define("CMAKE_TOOLCHAIN_FILE", toolchain_file);
+        config.define("ANDROID_ABI", abi);
+
+        set_cmake_define_if_present(&mut config, "ANDROID_PLATFORM");
+        set_cmake_define_if_present(&mut config, "ANDROID_STL");
+        set_cmake_define_if_present(&mut config, "ANDROID_ARM_MODE");
+        set_cmake_define_if_present(&mut config, "ANDROID_ARM_NEON");
+    }
+
     //Use ninja if present on system
     if is_ninja {
         config.generator("Ninja");
     }
 
     config.define("NNG_TESTS", "OFF");
     config.define("NNG_ENABLE_COMPAT", "OFF");
-    config.define("NNG_TRANSPORT_WS", "OFF");
     //File descriptor is experimental transport so don't use it
     //idk why it is ON by default
     config.define("NNG_TRANSPORT_FDC", "OFF");
 
+    #[cfg(not(feature = "stats"))]
+    config.define("NNG_ENABLE_STATS", "OFF");
+    #[cfg(feature = "stats")]
+    config.define("NNG_ENABLE_STATS", "ON");
+
     #[cfg(not(feature = "http"))]
     config.define("NNG_ENABLE_HTTP", "OFF");
     #[cfg(feature = "http")]
     config.define("NNG_ENABLE_HTTP", "ON");
 
+    #[cfg(not(feature = "websocket"))]
+    {
+        config.define("NNG_TRANSPORT_WS", "OFF");
+        config.define("NNG_TRANSPORT_WSS", "OFF");
+    }
+
+    #[cfg(feature = "websocket")]
+    {
+        config.define("NNG_TRANSPORT_WS", "ON");
+        #[cfg(feature = "tls")]
+        config.define("NNG_TRANSPORT_WSS", "ON");
+    }
+
     #[cfg(not(feature = "tls"))]
     {
         config.define("NNG_TRANSPORT_TLS", "OFF");