native lib loading

BestSolution-at · Jul 30, 2020 · 7b54fd7 · 7b54fd7
1 parent 05b4670
commit 7b54fd7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/org.eclipse.fx.drift/src/main/java/org/eclipse/fx/drift/internal/DriftCPP.java b/org.eclipse.fx.drift/src/main/java/org/eclipse/fx/drift/internal/DriftCPP.java
@@ -19,7 +19,7 @@ public static void require() {
 	}
 
 	private static void initOnce() {
-		NativeUtil.loadLibrary(DriftCPP.class, "driftcpp");
+		NativeUtil.loadLibrary(DriftCPP.class, "driftcpp", System::loadLibrary, System::load);
 		init(classLoader == null ? DriftCPP.class.getClassLoader() : classLoader);
 	}
 

diff --git a/org.eclipse.fx.drift/src/main/java/org/eclipse/fx/drift/internal/DriftFX.java b/org.eclipse.fx.drift/src/main/java/org/eclipse/fx/drift/internal/DriftFX.java
@@ -18,6 +18,6 @@ public static void require() {
 	}
 
 	public static void initOnce() {
-		NativeUtil.loadLibrary(DriftFX.class, "driftfx");
+		NativeUtil.loadLibrary(DriftFX.class, "driftfx", System::loadLibrary, System::load);
 	}
 }
diff --git a/org.eclipse.fx.drift/src/main/java/org/eclipse/fx/drift/util/NativeUtil.java b/org.eclipse.fx.drift/src/main/java/org/eclipse/fx/drift/util/NativeUtil.java
@@ -6,6 +6,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.function.Consumer;
 
 import org.eclipse.fx.drift.internal.Log;
 
@@ -42,11 +43,12 @@ public static boolean isMacOs() {
 		return getOsName().toLowerCase().contains("mac");
 	}
 
-	public static void loadLibrary(Class<?> context, String libname) {
+	public static void loadLibrary(Class<?> context, String libname, Consumer<String> loadLibrary, Consumer<String> load) {
 		if (USE_JAVA_LIBRARY_PATH || osgi) {
 			// osgi will take care of it
 			Log.info("loading " + libname + " via system call");
-			System.loadLibrary(libname);
+//			System.loadLibrary(libname);
+			loadLibrary.accept(libname);
 		}
 		else {
 
@@ -68,7 +70,8 @@ public static void loadLibrary(Class<?> context, String libname) {
 			}
 
 			Log.info("loading " + libname + " from extracted location (" + extractPath + ")");
-			System.load(extractPath.toString());
+//			System.load(extractPath.toString());
+			load.accept(extractPath.toString());
 		}
 	}