Rename net/jpountz/util/win32/amd64/liblz4-java.so to net/jpountz/util/windows/amd64/liblz4-java.dll (#25)

HTHou · web-flow · commit ef125a156679 · 2025-12-08T22:06:07.000+01:00
diff --git a/.github/workflows/build-all-and-publish.yml b/.github/workflows/build-all-and-publish.yml
@@ -147,7 +147,7 @@ jobs:
           if-no-files-found: error
 
   windows:
-    name: Windows natives (win32/amd64)
+    name: Windows natives (windows/amd64)
     runs-on: windows-latest
     steps:
       - name: Checkout
@@ -193,8 +193,8 @@ jobs:
       - name: Upload native library
         uses: actions/upload-artifact@v4
         with:
-          name: natives-win32-amd64
-          path: target/classes/net/jpountz/util/win32/amd64/liblz4-java.so
+          name: natives-windows-amd64
+          path: target/classes/net/jpountz/util/windows/amd64/liblz4-java.dll
           if-no-files-found: error
 
   assemble:
@@ -249,13 +249,13 @@ jobs:
           shopt -s nullglob
           for dir in assemble/natives/*; do
             base="$(basename "$dir")"
-            # Expect names like natives-linux-amd64, natives-darwin-aarch64, natives-win32-amd64
+            # Expect names like natives-linux-amd64, natives-darwin-aarch64, natives-windows-amd64
             os="${base#natives-}"
             arch="${os#*-}"; os="${os%%-*}"
             case "$os" in
               linux) ext=so ;;
               darwin) ext=dylib ;;
-              win32) ext=so ;;
+              windows) ext=dll ;;
               *) echo "Unknown OS in artifact: $base" >&2; continue ;;
             esac
             dest="target/classes/net/jpountz/util/$os/$arch"
diff --git a/pom.xml b/pom.xml
@@ -539,9 +539,8 @@
                 <phase>process-resources</phase>
                 <configuration>
                   <target>
-                    <property name="os.id" value="win32"/>
-                    <!-- Keep .so to match current Native.resourceName() -->
-                    <property name="lib.ext" value="so"/>
+                    <property name="os.id" value="windows"/>
+                    <property name="lib.ext" value="dll"/>
 
                     <!-- Arch mapping (overridable via -Darch.id) -->
                     <property name="arch.id" value="${os.arch}"/>
diff --git a/src/java/net/jpountz/util/Native.java b/src/java/net/jpountz/util/Native.java
@@ -27,8 +27,7 @@ public enum Native {
   ;
 
   private enum OS {
-    // Even on Windows, the default compiler from cpptasks (gcc) uses .so as a shared lib extension
-    WINDOWS("win32", "so"), LINUX("linux", "so"), MAC("darwin", "dylib"), SOLARIS("solaris", "so");
+    WINDOWS("windows", "dll"), LINUX("linux", "so"), MAC("darwin", "dylib"), SOLARIS("solaris", "so");
     public final String name, libExtension;
 
     private OS(String name, String libExtension) {

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,7 @@ public enum Native {`
`27`	`27`	`;`
`28`	`28`
`29`	`29`	`private enum OS {`
`30`		`- // Even on Windows, the default compiler from cpptasks (gcc) uses .so as a shared lib extension`
`31`		`- WINDOWS("win32", "so"), LINUX("linux", "so"), MAC("darwin", "dylib"), SOLARIS("solaris", "so");`
	`30`	`+ WINDOWS("windows", "dll"), LINUX("linux", "so"), MAC("darwin", "dylib"), SOLARIS("solaris", "so");`
`32`	`31`	`public final String name, libExtension;`
`33`	`32`
`34`	`33`	`private OS(String name, String libExtension) {`