Copy correct bindings for static linkage

Author: Charlie Friend

wrappers/rust/cpp-client-telemetry-sys/build.rs

@@ -1,9 +1,51 @@
 use std::env;
+use std::fs;
 use std::path::PathBuf;
+use subprocess::Exec;
 
 static PROJECT_ROOT: &str = "../../../";
 
+fn copy_static_libs() {
+    // TODO add compatibility for x86 and ARM
+    let cpp_project_out = PathBuf::from(PROJECT_ROOT).join("Solutions/out/Release/x64");
+    let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
+
+    std::fs::copy(cpp_project_out.join("win32-lib/ClientTelemetry.lib"), PathBuf::from(&out_dir).join("ClientTelemetry.lib"))
+        .expect("Failed to copy ClientTelemetry lib");
+    std::fs::copy(cpp_project_out.join("sqlite/sqlite.lib"), out_dir.join("sqlite.lib"))
+        .expect("Failed to copy sqlite native library");
+    std::fs::copy(cpp_project_out.join("zlib/zlib.lib"), out_dir.join("zlib.lib"))
+        .expect("Failed to copy zlib native library");
+
+    // Tell cargo to look for shared libraries in the specified directory
+    println!("cargo:rustc-link-search={}", out_dir.display());
+    println!("cargo:rustc-link-lib=ClientTelemetry");
+    println!("cargo:rustc-link-lib=wininet");
+    println!("cargo:rustc-link-lib=crypt32");
+    println!("cargo:rustc-link-lib=sqlite");
+    println!("cargo:rustc-link-lib=zlib");
+}
+
 fn write_bindings() {
+    // Precompile header with the appropriate preprocessor options
+    let mat_h_location = PathBuf::from(PROJECT_ROOT).join("lib/include/public/mat.h");
+    println!("cargo:rerun-if-changed={}", mat_h_location.to_string_lossy());
+
+    // TODO use clang crate instead of invoking CLI directly
+    let header_out = Exec::cmd("clang")
+        .arg("-E")
+        .arg(mat_h_location)
+        .arg("-D")
+        .arg("MATSDK_STATIC_LIB=1")
+        .capture()
+        .expect("Failed to open clang process")
+        .stdout_str();
+
+    let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
+    let mat_out_path = out_dir.join("mat.out.h");
+
+    fs::write(&mat_out_path, header_out).unwrap();
+
     // The bindgen::Builder is the main entry point
     // to bindgen, and lets you build up options for
     // the resulting bindings.
@@ -15,17 +57,11 @@ fn write_bindings() {
         // .raw_line("#![allow(non_upper_case_globals)]")
         // .raw_line("#![allow(non_camel_case_types)]")
         // .raw_line("#![allow(non_snake_case)]")
-        .clang_arg(format!("-I{}", PathBuf::from(PROJECT_ROOT).join("lib/include").display()))
-        .header("./include/wrapper.hpp")
-        //.enable_cxx_namespaces()
-        .allowlist_type("Microsoft::Applications::Events::LogManagerProvider")
-        .allowlist_recursively(true)
-        // STL types must be marked as 'opaque' as bindgen can't handle the internals of these types.
-        .opaque_type("std::(.*)")
-        //.blocklist_function("std::*")
-        // Tell cargo to invalidate the built crate whenever any of the
-        // included header files changed.
-        // .wrap_static_fns(true)
+        //.clang_arg(format!("-I{}", PathBuf::from(PROJECT_ROOT).join("lib/include").display()))
+        .header(PathBuf::from(out_dir).join("mat.out.h").to_string_lossy())
+        .allowlist_type("evt_.*")
+        .allowlist_function("evt_.*")
+        .allowlist_var("evt_.*")
         // Finish the builder and generate the bindings.
         .generate()
         // Unwrap the Result and panic on failure.
@@ -39,31 +75,6 @@ fn write_bindings() {
 }
 
 fn main() {
-    let mat_h_location = PathBuf::from(PROJECT_ROOT).join("lib/include/public/mat.h");
-    println!("cargo:rerun-if-changed={}", mat_h_location.to_string_lossy());
-
-    let out_dir = env::var("OUT_DIR").unwrap();
-    std::fs::copy("../lib/ClientTelemetry.lib", PathBuf::from(&out_dir).join("ClientTelemetry.lib"))
-        .expect("Failed to copy native ClientTelemetry lib");
-
-    // Tell cargo to look for shared libraries in the specified directory
-    println!("cargo:rustc-link-search=native={}", out_dir);
-    println!("cargo:rustc-link-lib=ClientTelemetry");
-
-    // // TODO use clang crate instead of invoking CLI directly
-    // let header_out = Exec::cmd("clang")
-    //     .arg("-E")
-    //     .arg(mat_h_location)
-    //     .arg("-D")
-    //     .arg("HAVE_DYNAMIC_C_LIB")
-    //     .capture()
-    //     .expect("Failed to open clang process")
-    //     .stdout_str();
-
-    // let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
-    // let mat_out_path = out_dir.join("mat.out.h");
-
-    // fs::write(&mat_out_path, header_out).unwrap();
-
     write_bindings();
+    copy_static_libs();
 }

wrappers/rust/cpp-client-telemetry-sys/src/lib.rs

@@ -3,7 +3,49 @@
 #![allow(non_snake_case)]
 include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
 
-fn test_fn() {
+use std::ffi::c_void;
+
+fn evt_api_call_wrapper(evt_context: Box<evt_context_t>) -> (evt_status_t, Box<evt_context_t>) {
+    let raw_pointer = Box::into_raw(evt_context);
+
+    let mut result: evt_status_t = -1;
+    unsafe {
+        result = evt_api_call_default(raw_pointer);
+    }
+
+    let out_context = unsafe { Box::from_raw(raw_pointer) };
+    (result, out_context)
+}
+
+fn evt_open(config: *mut c_void) -> Option<evt_handle_t> {
+    let context: Box<evt_context_t> = Box::new(evt_context_t {
+        call: evt_call_t_EVT_OP_OPEN,
+        handle: 0,
+        data: config,
+        result: 0,
+        size: 0,
+    });
+
+    let (result, context) = evt_api_call_wrapper(context);
+
+    if result == -1 {
+        return Option::None;
+    }
+
+    return Some(context.handle.clone());
+}
+
+pub fn evt_close(handle: &evt_handle_t) -> evt_status_t {
+    let context: Box<evt_context_t> = Box::new(evt_context_t {
+        call: evt_call_t_EVT_OP_CLOSE,
+        handle: *handle,
+        data: std::ptr::null_mut(),
+        result: 0,
+        size: 0,
+    });
+
+    let (result, _) = evt_api_call_wrapper(context);
+    result
 }
 
 #[cfg(test)]