From a0fab1374fbd15dc632b14bd1968cb0f24818843 Mon Sep 17 00:00:00 2001 From: Andrei Davydov Date: Tue, 31 Oct 2023 04:36:33 +0300 Subject: [PATCH] Java: Fix resources preparation --- java/dfp-math/build.gradle | 8 ++++---- java/dfpNativeTests/build.gradle | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/java/dfp-math/build.gradle b/java/dfp-math/build.gradle index 22f2526..18639f8 100644 --- a/java/dfp-math/build.gradle +++ b/java/dfp-math/build.gradle @@ -41,7 +41,7 @@ compileJava.dependsOn ":java:nativeWrappers:makeNativeWrappersDfpMath" def versionSuffix = versioning()["suffix"] task copyNativeDfpMathResourcesMuslToAmd64(type: Copy) { - from "$rootDir/native/bin/linux/musl" + from "$rootDir/native/bin/linux/musl-gcc" into "$rootDir/native/binmathJava/resources_com_epam_deltix_dfpmath/linux/amd64" include "**/*ddfpmath${versionSuffix}.so.zst" } @@ -49,9 +49,9 @@ task copyNativeDfpMathResourcesMuslToAmd64(type: Copy) { task copyNativeDfpMathResources(type: Copy, dependsOn: copyNativeDfpMathResourcesMuslToAmd64) { from "$rootDir/native/bin" into "$rootDir/native/binmathJava/resources_com_epam_deltix_dfpmath" - include "**/*ddfp${versionSuffix}.dylib.zst" - include "**/*ddfp${versionSuffix}.so.zst" - include "**/*ddfp${versionSuffix}.dll.zst" + include "**/*ddfpmath${versionSuffix}.dylib.zst" + include "**/*ddfpmath${versionSuffix}.so.zst" + include "**/*ddfpmath${versionSuffix}.dll.zst" exclude 'linux/amd64/**' exclude 'linux/musl-gcc/**' } diff --git a/java/dfpNativeTests/build.gradle b/java/dfpNativeTests/build.gradle index 3a3d998..0e3527e 100644 --- a/java/dfpNativeTests/build.gradle +++ b/java/dfpNativeTests/build.gradle @@ -34,7 +34,7 @@ compileJava.dependsOn ":java:nativeWrappers:makeNativeWrappersDfp" def versionSuffix = versioning()["suffix"] task copyNativeDfpResourcesMuslToAmd64(type: Copy) { - from "$rootDir/native/bin/linux/musl" + from "$rootDir/native/bin/linux/musl-gcc" into "$rootDir/native/binJava/resources_com_epam_deltix_dfp/linux/amd64" include "**/*ddfp${versionSuffix}.so.zst" }