From d19e08fb6c5bcef35956e91766f00b91294a7352 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 12 Mar 2024 08:01:39 +0100 Subject: [PATCH] Improve JNI deployment --- jni.mk | 6 +++--- repackage.mk | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jni.mk b/jni.mk index 920ecf4..8802183 100644 --- a/jni.mk +++ b/jni.mk @@ -14,7 +14,7 @@ DEP_INCLUDES ?= $(foreach dep, $(DEP_NATIVE), /usr/include/$(dep)) DEP_LIBS ?= $(foreach dep, $(DEP_NATIVE), -l$(dep)) A2_NATIVE_CATEGORY=$(A2_OUTPUT)/lib/linux/$(shell uname -m)/$(A2_CATEGORY) -TARGET_EXEC := libJava_$(NATIVE_PACKAGE).so +TARGET_EXEC := libJava_$(NATIVE_PACKAGE).$(MAJOR).$(MINOR).so LDFLAGS ?= -shared -fPIC -Wl,-soname,$(TARGET_EXEC).$(MAJOR).$(MINOR) $(DEP_LIBS) CFLAGS ?= -O3 -fPIC @@ -36,10 +36,10 @@ clean: $(RM) $(A2_NATIVE_CATEGORY)/$(TARGET_EXEC) install: - $(INSTALL) $(A2_NATIVE_INSTALL_TARGET) $(A2_NATIVE_CATEGORY)/$(TARGET_EXEC) + $(INSTALL) $(A2_NATIVE_INSTALL_TARGET)/$(A2_CATEGORY) $(A2_NATIVE_CATEGORY)/$(TARGET_EXEC) uninstall: - $(RM) $(A2_NATIVE_INSTALL_TARGET)/$(TARGET_EXEC) + $(RM) $(A2_NATIVE_INSTALL_TARGET)/$(A2_CATEGORY)/$(TARGET_EXEC) @if [ -d $(A2_NATIVE_INSTALL_TARGET) ]; then find $(A2_NATIVE_INSTALL_TARGET) -empty -type d -delete; fi # Sources diff --git a/repackage.mk b/repackage.mk index 84a85a6..87ce907 100644 --- a/repackage.mk +++ b/repackage.mk @@ -25,7 +25,7 @@ install: @echo Installed OS-dependent jars \'$(OS_CATEGORIES)\' to $(A2_INSTALL_TARGET) @$(foreach category, $(ARCH_CATEGORIES), $(INSTALL) $(A2_NATIVE_INSTALL_TARGET)/$(category:$(TARGET_ARCH_CATEGORY_PREFIX)/%=%) $(wildcard $(A2_OUTPUT)/$(category)/*.jar);$(LF)) @echo Installed arch-dependent jars \'$(ARCH_CATEGORIES)\' to $(A2_NATIVE_INSTALL_TARGET) - @$(foreach category, $(ARCH_CATEGORIES), $(INSTALL) $(A2_NATIVE_INSTALL_TARGET) $(wildcard $(A2_OUTPUT)/$(category)/*.so);$(LF)) + @$(foreach category, $(ARCH_CATEGORIES), $(INSTALL) $(A2_NATIVE_INSTALL_TARGET)/$(category:$(TARGET_ARCH_CATEGORY_PREFIX)/%=%) $(wildcard $(A2_OUTPUT)/$(category)/*.so);$(LF)) @echo Installed arch binaries \'$(ARCH_CATEGORIES)\' to $(A2_NATIVE_INSTALL_TARGET) uninstall: @@ -34,11 +34,11 @@ uninstall: @$(foreach category, $(OS_CATEGORIES), $(RMDIR) $(A2_INSTALL_TARGET)/$(category:$(TARGET_OS_CATEGORY_PREFIX)/%=%);$(LF)) @echo Uninstalled OS-dependent jars \'$(OS_CATEGORIES)\' to $(A2_INSTALL_TARGET) @$(foreach category, $(ARCH_CATEGORIES), $(RMDIR) $(A2_NATIVE_INSTALL_TARGET)/$(category:$(TARGET_ARCH_CATEGORY_PREFIX)/%=%);$(LF)) - @echo Uninstalled arch-dependent jars \'$(ARCH_CATEGORIES)\' to $(A2_NATIVE_INSTALL_TARGET) - @$(foreach category, $(ARCH_CATEGORIES), \ - $(foreach libfile, $(wildcard $(A2_OUTPUT)/$(category)/*.so), $(RMDIR) $(A2_NATIVE_INSTALL_TARGET)/$(notdir $(libfile));$(LF)) \ - ) - @echo Uninstalled arch binaries \'$(ARCH_CATEGORIES)\' to $(A2_NATIVE_INSTALL_TARGET) + @echo Uninstalled arch-dependent jars and binaries \'$(ARCH_CATEGORIES)\' to $(A2_NATIVE_INSTALL_TARGET) +# @$(foreach category, $(ARCH_CATEGORIES), \ +# $(foreach libfile, $(wildcard $(A2_OUTPUT)/$(category)/*.so), $(RMDIR) $(A2_NATIVE_INSTALL_TARGET)/$(notdir $(libfile));$(LF)) \ +# ) +# @echo Uninstalled arch binaries \'$(ARCH_CATEGORIES)\' to $(A2_NATIVE_INSTALL_TARGET) @if [ -d $(A2_INSTALL_TARGET) ]; then find $(A2_INSTALL_TARGET) -empty -type d -delete; fi @if [ -d $(A2_NATIVE_INSTALL_TARGET) ]; then find $(A2_NATIVE_INSTALL_TARGET) -empty -type d -delete; fi -- 2.30.2