Skip to content

Rename folder with native binaries from 'lib' to 'lib-native' #290

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

Open
jjohannes wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Rename folder with native binaries from 'lib' to 'lib-native' #290

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 arithmetic/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,32 +32,32 @@ dependencies {
}
task macAarch64LibCopy(type: Copy) {
from 'build/darwin-aarch64/lib/libeth_arithmetic.dylib'
into 'build/resources/main/lib/aarch64'
into 'build/resources/main/lib-native/aarch64'
}
processResources.dependsOn macAarch64LibCopy


task macLibCopy(type: Copy) {
from 'build/darwin-x86-64/lib/libeth_arithmetic.dylib'
into 'build/resources/main/lib/x86-64'
into 'build/resources/main/lib-native/x86-64'
}
processResources.dependsOn macLibCopy

task linuxLibCopy(type: Copy) {
from 'build/linux-gnu-x86_64/lib/libeth_arithmetic.so'
into 'build/resources/main/lib/x86-64'
into 'build/resources/main/lib-native/x86-64'
}
processResources.dependsOn linuxLibCopy

task linuxArm64LibCopy(type: Copy) {
from 'build/linux-gnu-aarch64/lib/libeth_arithmetic.so'
into 'build/resources/main/lib/aarch64'
into 'build/resources/main/lib-native/aarch64'
}
processResources.dependsOn linuxArm64LibCopy

task linuxRiscv64LibCopy(type: Copy) {
from 'build/linux-gnu-riscv64/lib/libeth_arithmetic.so'
into 'build/resources/main/lib/riscv64'
into 'build/resources/main/lib-native/riscv64'
}
processResources.dependsOn linuxRiscv64LibCopy

Expand Down
8 changes: 4 additions & 4 deletions blake2bf/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,27 +28,27 @@ dependencies {

task macAarch64LibCopy(type: Copy) {
from 'build/darwin-aarch64/lib/libblake2bf.dylib'
into 'build/resources/main/lib/aarch64'
into 'build/resources/main/lib-native/aarch64'
}

processResources.dependsOn macAarch64LibCopy

task macLibCopy(type: Copy) {
from 'build/darwin-x86-64/lib/libblake2bf.dylib'
into 'build/resources/main/lib/x86-64'
into 'build/resources/main/lib-native/x86-64'
}

processResources.dependsOn macLibCopy

task linuxLibCopy(type: Copy) {
from 'build/linux-gnu-x86_64/lib/libblake2bf.so'
into 'build/resources/main/lib/x86-64'
into 'build/resources/main/lib-native/x86-64'
}
processResources.dependsOn linuxLibCopy

task linuxArm64LibCopy(type: Copy) {
from 'build/linux-gnu-aarch64/lib/libblake2bf.so'
into 'build/resources/main/lib/aarch64'
into 'build/resources/main/lib-native/aarch64'
}
processResources.dependsOn linuxArm64LibCopy

Expand Down
10 changes: 5 additions & 5 deletions boringssl/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,31 +33,31 @@ dependencies {

task macArmLibCopy(type: Copy) {
from 'build/darwin-aarch64/lib/libboringssl_precompiles.dylib'
into 'build/resources/main/lib/aarch64'
into 'build/resources/main/lib-native/aarch64'
}
processResources.dependsOn macArmLibCopy

task macLibCopy(type: Copy) {
from 'build/darwin-x86-64/lib/libboringssl_precompiles.dylib'
into 'build/resources/main/lib/x86-64'
into 'build/resources/main/lib-native/x86-64'
}
processResources.dependsOn macLibCopy

task linuxLibCopy(type: Copy) {
from 'build/linux-gnu-x86_64/lib/libboringssl_precompiles.so'
into 'build/resources/main/lib/x86-64'
into 'build/resources/main/lib-native/x86-64'
}
processResources.dependsOn linuxLibCopy

task linuxArm64LibCopy(type: Copy) {
from 'build/linux-gnu-aarch64/lib/libboringssl_precompiles.so'
into 'build/resources/main/lib/aarch64'
into 'build/resources/main/lib-native/aarch64'
}
processResources.dependsOn linuxArm64LibCopy

task linuxRiscv64LibCopy(type: Copy) {
from 'build/linux-gnu-riscv64/lib/libboringssl_precompiles.so'
into 'build/resources/main/lib/riscv64'
into 'build/resources/main/lib-native/riscv64'
}
processResources.dependsOn linuxRiscv64LibCopy

Expand Down
4 changes: 3 additions & 1 deletion common/src/main/java/org/hyperledger/besu/nativelib/common/BesuNativeLibraryLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@ private static String safeArchLib(String platformNativeLibraryName) {
if (Arrays.asList(X86_VARIANTS).contains(arch)) {
arch = "x86-64";
}
return String.format("lib/%s/%s", arch, platformNativeLibraryName );
// It is important that the folder 'lib-native' contains a '-' such that it is only
// folder and not a 'java package' to wich visibility rules may be applied by JPMS.
return String.format("lib-native/%s/%s", arch, platformNativeLibraryName );
}
}
8 changes: 4 additions & 4 deletions constantine/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,23 @@ tasks.withType(JavaCompile) {

task macArmLibCopy(type: Copy) {
from "build/darwin-aarch64/lib/libconstantinebindings.dylib"
into 'build/resources/main/lib/aarch64'
into 'build/resources/main/lib-native/aarch64'
}

task macLibCopy(type: Copy) {
from "build/darwin-x86-64/lib/libconstantinebindings.dylib"
into 'build/resources/main/lib/x86-64'
into 'build/resources/main/lib-native/x86-64'
}

task linuxLibCopy(type: Copy) {
from "build/linux-gnu-x86_64/lib/libconstantinebindings.so"
into 'build/resources/main/lib/x86-64'
into 'build/resources/main/lib-native/x86-64'

}

task linuxArm64LibCopy(type: Copy) {
from "build/linux-gnu-aarch64/lib/libconstantinebindings.so"
into 'build/resources/main/lib/aarch64'
into 'build/resources/main/lib-native/aarch64'
}

processResources.dependsOn macArmLibCopy, macLibCopy, linuxLibCopy, linuxArm64LibCopy
Expand Down
10 changes: 5 additions & 5 deletions gnark/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,39 +34,39 @@ task macArmLibCopy(type: Copy) {
from 'build/darwin-aarch64/lib/libgnark_jni.dylib'
from 'build/darwin-aarch64/lib/libgnark_eip_2537.dylib'
from 'build/darwin-aarch64/lib/libgnark_eip_196.dylib'
into 'build/resources/main/lib/aarch64'
into 'build/resources/main/lib-native/aarch64'
}
processResources.dependsOn macArmLibCopy

task macLibCopy(type: Copy) {
from 'build/darwin-x86-64/lib/libgnark_jni.dylib'
from 'build/darwin-x86-64/lib/libgnark_eip_2537.dylib'
from 'build/darwin-x86-64/lib/libgnark_eip_196.dylib'
into 'build/resources/main/lib/x86-64'
into 'build/resources/main/lib-native/x86-64'
}
processResources.dependsOn macLibCopy

task linuxLibCopy(type: Copy) {
from 'build/linux-gnu-x86_64/lib/libgnark_jni.so'
from 'build/linux-gnu-x86_64/lib/libgnark_eip_2537.so'
from 'build/linux-gnu-x86_64/lib/libgnark_eip_196.so'
into 'build/resources/main/lib/x86-64'
into 'build/resources/main/lib-native/x86-64'
}
processResources.dependsOn linuxLibCopy

task linuxArm64LibCopy(type: Copy) {
from 'build/linux-gnu-aarch64/lib/libgnark_jni.so'
from 'build/linux-gnu-aarch64/lib/libgnark_eip_2537.so'
from 'build/linux-gnu-aarch64/lib/libgnark_eip_196.so'
into 'build/resources/main/lib/aarch64'
into 'build/resources/main/lib-native/aarch64'
}
processResources.dependsOn linuxArm64LibCopy

task linuxRiscv64LibCopy(type: Copy) {
from 'build/linux-gnu-riscv64/lib/libgnark_jni.so'
from 'build/linux-gnu-riscv64/lib/libgnark_eip_2537.so'
from 'build/linux-gnu-riscv64/lib/libgnark_eip_196.so'
into 'build/resources/main/lib/riscv64'
into 'build/resources/main/lib-native/riscv64'
}
processResources.dependsOn linuxRiscv64LibCopy

Expand Down
10 changes: 5 additions & 5 deletions ipa-multipoint/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,31 +44,31 @@ sourceSets {

task macArmLibCopy(type: Copy) {
from 'build/darwin-aarch64/lib/libipa_multipoint_jni.dylib'
into 'build/resources/main/lib/aarch64'
into 'build/resources/main/lib-native/aarch64'
}
processResources.dependsOn macArmLibCopy

task macLibCopy(type: Copy) {
from 'build/darwin-x86-64/lib/libipa_multipoint_jni.dylib'
into 'build/resources/main/lib/x86-64'
into 'build/resources/main/lib-native/x86-64'
}
processResources.dependsOn macLibCopy

task linuxLibCopy(type: Copy) {
from 'build/linux-gnu-x86_64/lib/libipa_multipoint_jni.so'
into 'build/resources/main/lib/x86-64'
into 'build/resources/main/lib-native/x86-64'
}
processResources.dependsOn linuxLibCopy

task linuxArm64LibCopy(type: Copy) {
from 'build/linux-gnu-aarch64/lib/libipa_multipoint_jni.so'
into 'build/resources/main/lib/aarch64'
into 'build/resources/main/lib-native/aarch64'
}
processResources.dependsOn linuxArm64LibCopy

task linuxRiscv64LibCopy(type: Copy) {
from 'build/linux-gnu-riscv64/lib/libipa_multipoint_jni.so'
into 'build/resources/main/lib/riscv64'
into 'build/resources/main/lib-native/riscv64'
}
processResources.dependsOn linuxRiscv64LibCopy

Expand Down
20 changes: 10 additions & 10 deletions secp256k1/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,62 +33,62 @@ dependencies {

task macArmLibCopy(type: Copy) {
from 'build/darwin-aarch64/lib/libsecp256k1.dylib'
into 'build/resources/main/lib/aarch64'
into 'build/resources/main/lib-native/aarch64'
}
processResources.dependsOn macArmLibCopy

task macLibCopy(type: Copy) {
from 'build/darwin-x86-64/lib/libsecp256k1.dylib'
into 'build/resources/main/lib/x86-64'
into 'build/resources/main/lib-native/x86-64'
}
processResources.dependsOn macLibCopy

task linuxLibCopy(type: Copy) {
from 'build/linux-gnu-x86_64/lib/libsecp256k1.so'
into 'build/resources/main/lib/x86-64'
into 'build/resources/main/lib-native/x86-64'
}
processResources.dependsOn linuxLibCopy

task linuxArm64LibCopy(type: Copy) {
from 'build/linux-gnu-aarch64/lib/libsecp256k1.so'
into 'build/resources/main/lib/aarch64'
into 'build/resources/main/lib-native/aarch64'
}
processResources.dependsOn linuxArm64LibCopy

task linuxRiscv64LibCopy(type: Copy) {
from 'build/linux-gnu-riscv64/lib/libsecp256k1.so'
into 'build/resources/main/lib/riscv64'
into 'build/resources/main/lib-native/riscv64'
}
processResources.dependsOn linuxRiscv64LibCopy

// JNI library copy tasks
task macArmJNILibCopy(type: Copy) {
from 'build/darwin-aarch64/lib/libsecp256k1_ecrecover.dylib'
into 'build/resources/main/lib/aarch64'
into 'build/resources/main/lib-native/aarch64'
}
processResources.dependsOn macArmJNILibCopy

task macJNILibCopy(type: Copy) {
from 'build/darwin-x86-64/lib/libsecp256k1_ecrecover.dylib'
into 'build/resources/main/lib/x86-64'
into 'build/resources/main/lib-native/x86-64'
}
processResources.dependsOn macJNILibCopy

task linuxJNILibCopy(type: Copy) {
from 'build/linux-gnu-x86_64/lib/libsecp256k1_ecrecover.so'
into 'build/resources/main/lib/x86-64'
into 'build/resources/main/lib-native/x86-64'
}
processResources.dependsOn linuxJNILibCopy

task linuxArm64JNILibCopy(type: Copy) {
from 'build/linux-gnu-aarch64/lib/libsecp256k1_ecrecover.so'
into 'build/resources/main/lib/aarch64'
into 'build/resources/main/lib-native/aarch64'
}
processResources.dependsOn linuxArm64JNILibCopy

task linuxRiscv64JNILibCopy(type: Copy) {
from 'build/linux-gnu-riscv64/lib/libsecp256k1_ecrecover.so'
into 'build/resources/main/lib/riscv64'
into 'build/resources/main/lib-native/riscv64'
}
processResources.dependsOn linuxRiscv64JNILibCopy

Expand Down
10 changes: 5 additions & 5 deletions secp256r1/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,35 +40,35 @@ tasks.named('compileTestJava').configure {
task macArmLibCopy(type: Copy) {
from 'besu-native-ec/release/darwin-aarch64/libbesu_native_ec.dylib'
from 'besu-native-ec/release/darwin-aarch64/libbesu_native_ec_crypto.dylib'
into 'build/resources/main/lib/aarch64'
into 'build/resources/main/lib-native/aarch64'
}
processResources.dependsOn macArmLibCopy

task macLibCopy(type: Copy) {
from 'besu-native-ec/release/darwin-x86-64/libbesu_native_ec.dylib'
from 'besu-native-ec/release/darwin-x86-64/libbesu_native_ec_crypto.dylib'
into 'build/resources/main/lib/x86-64'
into 'build/resources/main/lib-native/x86-64'
}
processResources.dependsOn macLibCopy

task linuxLibCopy(type: Copy) {
from 'besu-native-ec/release/linux-gnu-x86_64/libbesu_native_ec.so'
from 'besu-native-ec/release/linux-gnu-x86_64/libbesu_native_ec_crypto.so'
into 'build/resources/main/lib/x86-64'
into 'build/resources/main/lib-native/x86-64'
}
processResources.dependsOn linuxLibCopy

task linuxArm64LibCopy(type: Copy) {
from 'besu-native-ec/release/linux-gnu-aarch64/libbesu_native_ec.so'
from 'besu-native-ec/release/linux-gnu-aarch64/libbesu_native_ec_crypto.so'
into 'build/resources/main/lib/aarch64'
into 'build/resources/main/lib-native/aarch64'
}
processResources.dependsOn linuxArm64LibCopy

task linuxRiscv64LibCopy(type: Copy) {
from 'besu-native-ec/release/linux-gnu-riscv64/libbesu_native_ec.so'
from 'besu-native-ec/release/linux-gnu-riscv64/libbesu_native_ec_crypto.so'
into 'build/resources/main/lib/riscv64'
into 'build/resources/main/lib-native/riscv64'
}
processResources.dependsOn linuxRiscv64LibCopy

Expand Down
Loading