Fix windows-arm64 DLL name (#1031)

jline · Jul 17, 2024 · 89a99fc · 89a99fc
1 parent 76243b2
commit 89a99fc
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/native/Makefile b/native/Makefile
@@ -19,14 +19,14 @@ include Makefile.common
 
 .PHONY: all package native native-all deploy crossbuild ducible clean-native
 
-linux-armv6-digest:=@sha256:7bad6ab302af34bdf6634c8c2b02c8dc6ac932c67da9ecc199c549ab405e971e
-linux-x86-digest:=:latest
-windows-static-x86-digest:=@sha256:99d7069789560ef77a7504ead4a2b5e3c245cb45a45f964c74fecbf649398d3a
+linux-armv6-digest:=@sha256:a90a7deda7f561932d9ad658f8d661d17eeb44f4e7f7024ac087db1d0b95c6f5
+linux-x86-digest:=@sha256:fbe45fcb0c2ce82f84a998a1d37d67b3906502723ed89f8191c3243d9d835d17
+windows-static-x86-digest:=@sha256:b205eeeafaef4f44482d16254670da815d5679b03cf8e51e4adc3539d1c4a9c0
 windows-static-x64-digest:=@sha256:f159861bc80b29e5dafb223477167bec53ecec6cdacb051d31e90c5823542100
-windows-arm64-digest:=@sha256:f4b3c1a49ec8b53418cef1499dc3f9a54a5570b7a3ecdf42fc8c83eb94b01b7d
+windows-arm64-digest:=@sha256:5a8e872064c5f600386e4124f9425d3e2ce2e168cadb6626655b2d69ed748849
 cross-build-digest:=@sha256:8dbaa86462270db93ae1b1b319bdd88d89272faf3a68632daf4fa36b414a326e
 freebsd-crossbuild-digest:=@sha256:cda62697a15d8bdc0bc26e780b1771ee78f12c55e7d5813e62c478af5a747c43
-mcandre-snek-digest:=@sha256:9f84e9fcdf66daafc1f1c3fb772a6c97977714e17800aeac2e3bbe5dc5039dd0
+mcandre-snek-digest:=@sha256:e5aaf20daece19796dcd0553feb971143b71cc67d13d79d73649cc689fb87287
 
 all: package
 

diff --git a/native/Makefile.common b/native/Makefile.common
@@ -17,7 +17,7 @@
 
 # os=Default is meant to be generic unix/linux
 
-known_targets := Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-arm64 Linux-ppc64 Linux-riscv64 Mac-x86 Mac-x86_64 Mac-arm64 DragonFly-x86_64 FreeBSD-x86_64 OpenBSD-x86_64 Windows-x86 Windows-x86_64 SunOS-sparcv9 HPUX-ia64_32
+known_targets := Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-arm64 Linux-ppc64 Linux-riscv64 Mac-x86 Mac-x86_64 Mac-arm64 DragonFly-x86_64 FreeBSD-x86_64 OpenBSD-x86_64 Windows-x86 Windows-x86_64 Windows-arm64 SunOS-sparcv9 HPUX-ia64_32
 target := $(OS_NAME)-$(OS_ARCH)
 
 ifeq (,$(findstring $(strip $(target)),$(known_targets)))
@@ -152,6 +152,11 @@ Windows-x86_64_CCFLAGS      := -D_JNI_IMPLEMENTATION_ -Itarget/inc -Itarget/inc/
 Windows-x86_64_LINKFLAGS    := -Wl,--kill-at -shared -static-libgcc
 Windows-x86_64_LIBNAME      := jlinenative.dll
 
+Windows-arm64_CC           := $(CROSS_PREFIX)gcc
+Windows-arm64_STRIP        := $(CROSS_PREFIX)strip
+Windows-arm64_CCFLAGS      := -D_JNI_IMPLEMENTATION_ -Itarget/inc -Itarget/inc/windows -Os
+Windows-arm64_LINKFLAGS    := -Wl,--kill-at -shared -static-libgcc
+Windows-arm64_LIBNAME      := jlinenative.dll
 
 CC        := $($(target)_CC)
 STRIP     := $($(target)_STRIP)

diff --git a/native/src/main/resources/org/jline/nativ/Linux/x86/libjlinenative.so b/native/src/main/resources/org/jline/nativ/Linux/x86/libjlinenative.so
diff --git a/native/src/main/resources/org/jline/nativ/Mac/arm64/libjlinenative.jnilib b/native/src/main/resources/org/jline/nativ/Mac/arm64/libjlinenative.jnilib
diff --git a/...ine/nativ/Windows/arm64/libjlinenative.so → ...jline/nativ/Windows/arm64/jlinenative.dll b/...ine/nativ/Windows/arm64/libjlinenative.so → ...jline/nativ/Windows/arm64/jlinenative.dll