Fix cleanup on Windows

shreyasm-dev · Jul 24, 2023 · 2ec544b · 2ec544b
1 parent e361a36
commit 2ec544b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "jnat"
-version = "0.2.0"
+version = "0.2.1"
 edition = "2021"
 license = "MIT"
 description = "A wrapper around the jni crate"

diff --git a/integration/main.rs b/integration/main.rs
@@ -20,8 +20,9 @@ static DYLIB_EXTENSION: &str = "so";
 #[cfg(target_os = "windows")]
 static DYLIB_EXTENSION: &str = "dll";
 
-// TODO: Ensure this works correctly
 fn get_dylib_name(lib: &str) -> String {
+  #[cfg(target_os = "windows")]
+  return format!("{}.{}", lib, DYLIB_EXTENSION);
   format!("lib{}.{}", lib, DYLIB_EXTENSION)
 }
 
@@ -172,6 +173,18 @@ fn main() {
 
     remove_file(Path::new("out").join(format!("{}.class", t.java_class)))
       .expect(format!("Failed to remove {}.class", t.java_class).as_str());
+
+    #[cfg(target_os = "windows")]
+    {
+      remove_file(Path::new("out").join(format!("{}.exp", get_dylib_name(t.lib))))
+        .expect(format!("Failed to remove {}.lib", get_dylib_name(t.lib)).as_str());
+
+      remove_file(Path::new("out").join(format!("{}.lib", get_dylib_name(t.lib))))
+        .expect(format!("Failed to remove {}.lib", get_dylib_name(t.lib)).as_str());
+
+      remove_file(Path::new("out").join(format!("{}.pdb", t.lib)))
+        .expect(format!("Failed to remove {}.pdb", t.lib).as_str());
+    }
   }
 
   teardown();