Version 0.1 beta 5 (#29)

* fix cross compile msvc on unix host (#28)

* Remove dagerous derive debug and derive copy

* Bump to version 0.1-beta.5+2.4.4

* Fix crates.io link

Author: mveril

.github/workflows/release-and-deploy.yml

@@ -132,6 +132,7 @@ jobs:
           Import-Module -Name PSSemVer -ErrorAction Stop
           try {
               $rawVersion = $tagName -replace '^v', ''
+              echo "version=$rawVersion" >> $env:GITHUB_ENV
               $Version = [PSSemVer]::Parse($rawVersion)
               $prereleaseValue = ($Version.Prerelease -ne $null).ToString().ToLower()
               echo "prerelease=$prereleaseValue" >> $env:GITHUB_ENV
@@ -158,7 +159,7 @@ jobs:
           name: ${{ env.prerelease == 'true' && 'Prerelease' || 'Release' }} ${{ env.TAG_NAME }}
           body: |
             This is a **${{ env.prerelease == 'true' && 'prerelease' || 'release' }}** release of **${{ github.repository }}**.
-            - The crate is available on [Crates.io](https://crates.io/crates/${{ github.repository.name }}).
+            - The crate is available on [Crates.io](https://crates.io/crates/wslpluginapi-sys/${{ env.version }}).
             - This version provides bindings for **WSLPluginAPI v${{ env.nuget_version }}**, available on [NuGet](https://www.nuget.org/packages/Microsoft.WSL.PluginApi/${{ env.nuget_version }}).
           prerelease: ${{ env.prerelease == 'true' }}
 

Cargo.toml

@@ -6,7 +6,7 @@ default-members = ["wslpluginapi-sys"]
 
 [workspace.package]
 name = "wslpluginapi-sys"
-version = "0.1.0-beta.4+2.4.4"
+version = "0.1.0-beta.5+2.4.4"
 edition = "2021"
 readme = "README.md"
 authors = ["Mickaël Véril <mika.veril@wanadoo.fr>"]

wslpluginapi-sys/Cargo.toml

@@ -20,6 +20,9 @@ bindgen = "0.72"
 cfg-if = "1.0"
 constcat = "0.6"
 
+[target.'cfg(unix)'.build-dependencies]
+cow-utils = { version = "0.1" }
+
 [dependencies]
 libc = "0.2"
 struct-field-names-as-array = { version = "0.3", features = [

wslpluginapi-sys/build/header_processing.rs

@@ -1,10 +1,13 @@
-use std::{borrow::Cow, collections::HashMap, path::Path, vec};
 #[cfg(unix)]
-use std::{env, path::PathBuf};
-
+use crate::WSL_PLUGIN_API_HEADER_FILE_NAME;
 use bindgen::callbacks::{ParseCallbacks, TypeKind};
-
 use cfg_if::cfg_if;
+#[cfg(unix)]
+use cow_utils::CowUtils;
+use std::{borrow::Cow, collections::HashMap, path::Path, vec};
+#[cfg(unix)]
+use std::{env, fs, io::Write, path::PathBuf};
+
 #[derive(Debug)]
 struct BindgenCallback;
 
@@ -47,21 +50,29 @@ fn rust_to_llvm_target() -> HashMap<&'static str, &'static str> {
 
 /// If the host is not Windows, replace `Windows.h` with `windows.h` in a temporary file.
 #[cfg(unix)]
-fn preprocess_header<P: AsRef<Path>>(
-    header_path: P,
-) -> Result<PathBuf, Box<dyn std::error::Error>> {
-    use std::{fs, io::Write, path::PathBuf};
-
-    use crate::WSL_PLUGIN_API_HEADER_FILE_NAME;
-
+fn preprocess_header<'a, P: 'a + AsRef<Path>>(
+    header_path: &'a P,
+) -> Result<Cow<'a, Path>, Box<dyn std::error::Error>> {
     let content = fs::read_to_string(&header_path)?;
-    let modified_content = content.replace("Windows.h", "windows.h");
+    let target_env = std::env::var("CARGO_CFG_TARGET_ENV").unwrap_or_default();
+    let new_content = if target_env == "msvc" {
+        content.cow_replace("windows.h", "Windows.h")
+    } else {
+        content.cow_replace("Windows.h", "windows.h")
+    };
 
-    let out_dir: PathBuf = env::var("OUT_DIR")?.into();
-    let comp_h_file_path = out_dir.join(format!("unix_{}", WSL_PLUGIN_API_HEADER_FILE_NAME));
-    fs::File::create(&comp_h_file_path)?.write_all(modified_content.as_bytes())?;
-    println!("Using modified header file at: {:?}", &comp_h_file_path);
-    Ok(comp_h_file_path)
+    let result = match new_content {
+        Cow::Borrowed(_) => Cow::Borrowed(header_path.as_ref()),
+        Cow::Owned(ref modified_content) => {
+            let out_dir: PathBuf = env::var("OUT_DIR")?.into();
+            let out_path = out_dir.join(format!("unix_{}", WSL_PLUGIN_API_HEADER_FILE_NAME));
+            let mut file = fs::File::create(&out_path)?;
+            file.write_all(modified_content.as_bytes())?;
+            println!("Using modified header file at: {:?}", &out_path);
+            Cow::Owned(out_path)
+        }
+    };
+    Ok(result)
 }
 
 pub(crate) fn process<P: AsRef<Path>, S: AsRef<str>>(
@@ -72,14 +83,15 @@ pub(crate) fn process<P: AsRef<Path>, S: AsRef<str>>(
     let host = host.as_ref();
     let target = target.as_ref();
     // Here we use cow to have the same type and avoiding clowning the PathBuff
-    cfg_if! {
-        if #[cfg(unix)] {
-            let header_file_path: Cow<'_, Path> = Cow::Owned(preprocess_header(header_file_path)?);
-        }
-        else {
-            let header_file_path: Cow<'_, Path> = Cow::Borrowed(header_file_path.as_ref());
+    let header_file_path: Cow<'_, Path> = {
+        cfg_if! {
+            if #[cfg(unix)] {
+                preprocess_header(&header_file_path)?
+            } else {
+                Cow::Borrowed(header_file_path.as_ref())
+            }
         }
-    }
+    };
     let mut builder = bindgen::Builder::default()
         .header(header_file_path.to_str().unwrap())
         .raw_line("use windows::core::*;")
@@ -91,8 +103,6 @@ pub(crate) fn process<P: AsRef<Path>, S: AsRef<str>>(
         .raw_line("#[allow(clippy::upper_case_acronyms)] type DWORD = u32;")
         .raw_line(r#"#[cfg(feature = "hooks-field-names")]"#)
         .raw_line("use struct_field_names_as_array::FieldNamesAsSlice;")
-        .derive_debug(true)
-        .derive_copy(true)
         .allowlist_item("WSL.*")
         .allowlist_item("Wsl.*")
         .clang_arg("-fparse-all-comments")