tyler.durden/snappy-java
1
0
Fork 0
mirror of https://github.com/xerial/snappy-java.git synced 2025-07-24 06:24:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: rename osname and image arch

Browse Source
This commit is contained in:
Samuel Fernandes 2025-02-05 09:51:08 +00:00
parent 4f963ca6e7
commit 61ad7a70b1
No known key found for this signature in database
GPG Key ID: C74A5164FE13D9B6
6 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -151,7 +151,7 @@ native: jni-header snappy-header $(NATIVE_DLL)
native-nocmake: jni-header $(NATIVE_DLL)
snappy: native $(TARGET)/$(snappy-jar-version).jar
native-all: native native-arm clean-docker mac64 win32 win64 linux32 linux64 linux-ppc64le linux-riscv64 linux-s390x alpine-image alpine
native-all: native native-arm clean-docker mac64 win32 win64 linux32 linux64 linux-ppc64le linux-riscv64 linux-s390x musl-image musl
ifdef CI
# Clean docker images within CI to avoid no space left error
@ -199,11 +199,11 @@ linux32: jni-header
linux64: jni-header
docker run $(DOCKER_RUN_OPTS) -i -v $$PWD:/work xerial/centos5-linux-x86_64-pic bash -c 'make clean-native native-nocmake OS_NAME=Linux OS_ARCH=x86_64'
alpine-image:
docker build -f docker/Dockerfile.linux-x86_64-alpine -t snappy-java-alpine .
musl-image:
docker build -f docker/Dockerfile.linux-x86_64-musl -t snappy-java-musl .
alpine: jni-header
docker run $(DOCKER_RUN_OPTS) -i -v $$PWD:/work snappy-java-alpine bash -c 'make clean-native native-nocmake OS_NAME=Linux OS_ARCH=x86_64-alpine'
musl: jni-header
docker run $(DOCKER_RUN_OPTS) -i -v $$PWD:/work snappy-java-musl bash -c 'make clean-native native-nocmake OS_NAME=Linux OS_ARCH=x86_64-musl'
freebsd64:
$(MAKE) native OS_NAME=FreeBSD OS_ARCH=x86_64

16
Makefile.common
View File

@ -50,7 +50,7 @@ endif
# os=Default is meant to be generic unix/linux
# To support new CPU architecture, add a new target name here
known_os_archs := Linux-x86_64-alpine Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-android-aarch64 Linux-aarch64 Linux-ppc Linux-ppc64 Linux-ppc64le Linux-s390 Linux-s390x Mac-x86 Mac-x86_64 Mac-aarch64 FreeBSD-x86_64 Windows-x86 Windows-x86_64 Windows-aarch64 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc AIX-ppc64 Linux-riscv Linux-riscv64 Linux-loongarch Linux-loongarch64
known_os_archs := Linux-x86_64-musl Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-android-aarch64 Linux-aarch64 Linux-ppc Linux-ppc64 Linux-ppc64le Linux-s390 Linux-s390x Mac-x86 Mac-x86_64 Mac-aarch64 FreeBSD-x86_64 Windows-x86 Windows-x86_64 Windows-aarch64 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc AIX-ppc64 Linux-riscv Linux-riscv64 Linux-loongarch Linux-loongarch64
os_arch := $(OS_NAME)-$(OS_ARCH)
IBM_JDK_7 := $(findstring IBM, $(shell $(JAVA) -version 2>&1 | grep IBM | grep "JRE 1.7"))
@ -102,16 +102,16 @@ Linux-x86_64_LINKFLAGS := -shared -static-libgcc -static-libstdc++
Linux-x86_64_LIBNAME := libsnappyjava.so
Linux-x86_64_SNAPPY_FLAGS :=
Linux-x86_64-alpine_CXX := $(CROSS_PREFIX)g++
Linux-x86_64-alpine_STRIP := $(CROSS_PREFIX)strip
Linux-x86_64-musl_CXX := $(CROSS_PREFIX)g++
Linux-x86_64-musl_STRIP := $(CROSS_PREFIX)strip
ifeq ($(IBM_JDK_7),)
Linux-x86_64-alpine_CXXFLAGS := -Ilib/inc_linux -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -m64 -std=c++11
Linux-x86_64-musl_CXXFLAGS := -Ilib/inc_linux -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -m64 -std=c++11
else
Linux-x86_64-alpine_CXXFLAGS := -include $(IBM_JDK_LIB)/jni_md.h -include $(IBM_JDK_LIB)/jniport.h -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -m64 -std=c++11
Linux-x86_64-musl_CXXFLAGS := -include $(IBM_JDK_LIB)/jni_md.h -include $(IBM_JDK_LIB)/jniport.h -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -m64 -std=c++11
endif
Linux-x86_64-alpine_LINKFLAGS := -shared -static-libgcc -static-libstdc++
Linux-x86_64-alpine_LIBNAME := libsnappyjava.so
Linux-x86_64-alpine_SNAPPY_FLAGS :=
Linux-x86_64-musl_LINKFLAGS := -shared -static-libgcc -static-libstdc++
Linux-x86_64-musl_LIBNAME := libsnappyjava.so
Linux-x86_64-musl_SNAPPY_FLAGS :=
Linux-ppc_CXX := g++
Linux-ppc_STRIP := strip

2
build.sbt
View File

@ -111,7 +111,7 @@ OsgiKeys.additionalHeaders := Map(
"org/xerial/snappy/native/Linux/ppc64/libsnappyjava.so;osname=linux;processor=ppc64le",
"org/xerial/snappy/native/Linux/s390x/libsnappyjava.so;osname=linux;processor=s390x",
"org/xerial/snappy/native/Linux/loongarch64/libsnappyjava.so;osname=linux;processor=loongarch64",
"org/xerial/snappy/native/Linux/x86_64-alpine/libsnappyjava.so;osname=Linux;processor=x86-64-alpine",
"org/xerial/snappy/native/Linux/x86_64-musl/libsnappyjava.so;osname=Linux;processor=x86-64-musl",
"org/xerial/snappy/native/AIX/ppc/libsnappyjava.a;osname=aix;processor=ppc",
"org/xerial/snappy/native/AIX/ppc64/libsnappyjava.a;osname=aix;processor=ppc64",
"org/xerial/snappy/native/SunOS/x86/libsnappyjava.so;osname=sunos;processor=x86",

0
docker/Dockerfile.linux-x86_64-alpine → docker/Dockerfile.linux-x86_64-musl
View File

9
src/main/java/org/xerial/snappy/OSInfo.java
View File

@ -25,6 +25,7 @@
package org.xerial.snappy;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
@ -215,6 +216,10 @@ public class OSInfo {
return "android-arm";
}
if (isMusl()) {
return "x86_64-musl";
}
if(osArch.startsWith("arm")) {
osArch = resolveArmArchType();
}
@ -226,6 +231,10 @@ public class OSInfo {
return translateArchNameToFolderName(osArch);
}
private static boolean isMusl() {
return new File("/lib/ld-musl-x86_64.so.1").exists();
}
static String translateOSNameToFolderName(String osName) {
if(osName.contains("Windows")) {
return "Windows";

0
src/main/resources/org/xerial/snappy/native/Linux/x86_64-alpine/libsnappyjava.so → src/main/resources/org/xerial/snappy/native/Linux/x86_64-musl/libsnappyjava.so
View File