From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 7 Mar 2024 05:35:37 +0000 (+0100)
Subject: Keep native libraries in bundles
X-Git-Tag: v2.3.10~13
X-Git-Url: https://git.argeo.org/?p=cc0%2Fargeo-build.git;a=commitdiff_plain;h=6a1f19b6db440f902c237da73b2da0ed1aa1cb5c

Keep native libraries in bundles
---

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index ccdd889..f379b4e 100644
--- a/src/org/argeo/build/Repackage.java
+++ b/src/org/argeo/build/Repackage.java
@@ -1126,6 +1126,7 @@ public class Repackage {
 				Files.copy(jarIn, target);
 
 				// native libraries
+				boolean removeDllFromJar = false;
 				if (isNative && (entry.getName().endsWith(".so") || entry.getName().endsWith(".dll")
 						|| entry.getName().endsWith(".jnilib"))) {
 					Path categoryDir = bundleDir.getParent();
@@ -1149,8 +1150,11 @@ public class Repackage {
 							Files.delete(targetDll);
 						Files.copy(target, targetDll);
 					}
-					Files.delete(target);
-					origin.deleted.add(bundleDir.relativize(target).toString());
+
+					if (removeDllFromJar) {
+						Files.delete(target);
+						origin.deleted.add(bundleDir.relativize(target).toString());
+					}
 				}
 				logger.log(TRACE, () -> "Copied " + target);
 			}