Java: Support original zstd artifacts placement

[skip ci]
epam · Oct 31, 2023 · c544028 · c544028
1 parent e1b95af
commit c544028
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 22 deletions.
diff --git a/java/dfp-math/build.gradle b/java/dfp-math/build.gradle
@@ -26,7 +26,7 @@ sourceSets {
         "$rootDir/NativeUtils/java/main/src/main/java",
         "$rootDir/NativeUtils/Zstandard/java/src/main/java"]
 
-    main.resources.srcDirs += "$rootDir/native/binmathJava/"
+    main.resources.srcDirs += "$rootDir/native/binmathJava/Release/"
 }
 
 dependencies {
@@ -38,20 +38,18 @@ dependencies {
 
 compileJava.dependsOn ":java:nativeWrappers:makeNativeWrappersDfpMath"
 
-def versionSuffix = versioning()["suffix"]
-
 task copyNativeDfpMathResourcesMuslToAmd64(type: Copy) {
-    from "$rootDir/native/bin/linux/musl-gcc"
-    into "$rootDir/native/binmathJava/resources_com_epam_deltix_dfpmath/linux/amd64"
-    include "**/*ddfpmath${versionSuffix}.so.zst"
+    from "$rootDir/native/binmath/Release/linux/musl-gcc"
+    into "$rootDir/native/binmathJava/Release/resources_com_epam_deltix_dfpmath/linux/amd64"
+    include "**/*.so.zst"
 }
 
 task copyNativeDfpMathResources(type: Copy, dependsOn: copyNativeDfpMathResourcesMuslToAmd64) {
-    from "$rootDir/native/bin"
-    into "$rootDir/native/binmathJava/resources_com_epam_deltix_dfpmath"
-    include "**/*ddfpmath${versionSuffix}.dylib.zst"
-    include "**/*ddfpmath${versionSuffix}.so.zst"
-    include "**/*ddfpmath${versionSuffix}.dll.zst"
+    from "$rootDir/native/binmath/Release"
+    into "$rootDir/native/binmathJava/Release/resources_com_epam_deltix_dfpmath"
+    include "**/*.dylib.zst"
+    include "**/*.so.zst"
+    include "**/*.dll.zst"
     exclude 'linux/amd64/**'
     exclude 'linux/musl-gcc/**'
 }

diff --git a/java/dfpNativeTests/build.gradle b/java/dfpNativeTests/build.gradle
@@ -18,7 +18,7 @@ sourceSets {
         "$rootDir/NativeUtils/java/main/src/main/java",
         "$rootDir/NativeUtils/Zstandard/java/src/main/java"]
 
-    test.resources.srcDirs += "$rootDir/native/binJava/"
+    test.resources.srcDirs += "$rootDir/native/binJava/Release/"
 }
 
 dependencies {
@@ -31,20 +31,18 @@ dependencies {
 
 compileJava.dependsOn ":java:nativeWrappers:makeNativeWrappersDfp"
 
-def versionSuffix = versioning()["suffix"]
-
 task copyNativeDfpResourcesMuslToAmd64(type: Copy) {
-    from "$rootDir/native/bin/linux/musl-gcc"
-    into "$rootDir/native/binJava/resources_com_epam_deltix_dfp/linux/amd64"
-    include "**/*ddfp${versionSuffix}.so.zst"
+    from "$rootDir/native/bin/Release/linux/musl-gcc"
+    into "$rootDir/native/binJava/Release/resources_com_epam_deltix_dfp/linux/amd64"
+    include "**/*.so.zst"
 }
 
 task copyNativeDfpResources(type: Copy, dependsOn: copyNativeDfpResourcesMuslToAmd64) {
-    from "$rootDir/native/bin"
-    into "$rootDir/native/binJava/resources_com_epam_deltix_dfp"
-    include "**/*ddfp${versionSuffix}.dylib.zst"
-    include "**/*ddfp${versionSuffix}.so.zst"
-    include "**/*ddfp${versionSuffix}.dll.zst"
+    from "$rootDir/native/bin/Release"
+    into "$rootDir/native/binJava/Release/resources_com_epam_deltix_dfp"
+    include "**/*.dylib.zst"
+    include "**/*.so.zst"
+    include "**/*.dll.zst"
     exclude 'linux/amd64/**'
     exclude 'linux/musl-gcc/**'
 }