Skip to content

Rename windows JNI lib to liblz4-java.dll #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yawkat merged 1 commit into from
Dec 8, 2025
Merged

Rename windows JNI lib to liblz4-java.dll #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/build-all-and-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -188,8 +188,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:
Expand Down Expand Up @@ -244,13 +244,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"
Expand Down
5 changes: 2 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"/>
Expand Down
3 changes: 1 addition & 2 deletions src/java/net/jpountz/util/Native.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down